X-Git-Url: https://vaikene.ee/gitweb/highlight.css?a=blobdiff_plain;f=src%2Flibs%2FPlugins%2Fpluginmanager.cpp;h=dac188f4a6a4addd612fce260fc98dee043f6c1d;hb=7e6c580d1324e48375638b5f9ccbab4bff90f049;hp=69ca736800cd51e1908d98fa6a1538a010004a78;hpb=6f46eb208327c27aacdf84d6c4f7df5078ab24b3;p=evaf diff --git a/src/libs/Plugins/pluginmanager.cpp b/src/libs/Plugins/pluginmanager.cpp index 69ca736..dac188f 100644 --- a/src/libs/Plugins/pluginmanager.cpp +++ b/src/libs/Plugins/pluginmanager.cpp @@ -369,6 +369,15 @@ bool PluginManagerPrivate::loadQtPlugin(QString const & name) const if (!QFile::exists(t)) fileName = t; # endif +#endif + +#ifdef Q_OS_CYGWIN + fileName = QString("%1cygq%2.dll").arg(Common::iApp::instance()->qtPluginsDir()).arg(name); +# ifndef QT_NO_DEBUG + QString t = QString("%1libq%2.dll.debug").arg(Common::iApp::instance()->qtPluginsDir()).arg(name); + if (QFile::exists(t)) + fileName = t; +# endif #endif if (fileName.isEmpty()) { @@ -457,7 +466,7 @@ iPlugin * Module::create(QString const & name) // If the module is not loaded, load it now if (!mLoader) { if (!load()) - return false; + return 0; } iPlugin * i = 0;