← Back to branch summary

~ubuntu-branches/debian/sid/qpdfview/sid

« back to all changes in this revision

Viewing changes to sources/pluginhandler.cpp

  • Committer: Package Import Robot
  • Author(s): Benjamin Eltzner
  • Date: 2013-07-30 00:00:25 UTC
  • mfrom: (1.2.9)
  • Revision ID: package-import@ubuntu.com-20130730000025-lsj8rjj0brpaj5ve
Tags: 0.4.4-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sources/pluginhandler.cpp
123
123
    {
124
124
        fileType = PDF;
125
125
    }
126
 
    else if(fileInfo.suffix().toLower() == "ps")
 
126
    else if(fileInfo.suffix().toLower() == "ps" || fileInfo.suffix().toLower() == "eps")
127
127
    {
128
128
        fileType = PS;
129
129
    }
205
205
 
206
206
    if(!pluginLoader.load())
207
207
    {
 
208
        const QString firstFileName = pluginLoader.fileName();
 
209
        const QString firstErrorString = pluginLoader.errorString();
 
210
 
208
211
        pluginLoader.setFileName(QDir(PLUGIN_INSTALL_PATH).absoluteFilePath(fileName));
209
212
 
210
213
        if(!pluginLoader.load())
211
214
        {
212
 
            qCritical() << "Could not load plug-in:" << fileName;
 
215
            qCritical() << "Could not load plug-in in first attempt:" << firstFileName;
 
216
            qCritical() << firstErrorString;
 
217
 
 
218
            qCritical() << "Could not load plug-in in second attempt:" << pluginLoader.fileName();
213
219
            qCritical() << pluginLoader.errorString();
214
220
 
215
221
            return 0;
220
226
 
221
227
    if(plugin == 0)
222
228
    {
223
 
        qCritical() << "Could not instantiate plug-in:" << fileName;
 
229
        qCritical() << "Could not instantiate plug-in:" << pluginLoader.fileName();
224
230
        qCritical() << pluginLoader.errorString();
225
231
    }
226
232