Ticket #246: qmlpluginfix.diff

src/declarative/qml/qdeclarativeimport.cpp

@@ -878 +878 @@
                          << QLatin1String("d.dll") // try a qmake-style debug build first
 # endif
                          << QLatin1String(".dll"));
+
 #elif defined(Q_OS_SYMBIAN)
     return resolvePlugin(qmldirPath, qmldirPluginPath, baseName,
                          QStringList()
                          << QLatin1String(".dll")
                          << QLatin1String(".qtplugin"));
-#else
 
-# if defined(Q_OS_DARWIN)
-
+#elif defined(Q_OS_DARWIN)
     return resolvePlugin(qmldirPath, qmldirPluginPath, baseName,
                          QStringList()
 # ifdef QT_DEBUG
@@ -899 +898 @@
                          << QLatin1String(".so")
                          << QLatin1String(".bundle"),
                          QLatin1String("lib"));
+
+#elif defined(Q_OS_OS2)
+    QString newBaseName;
+# ifdef QT_DEBUG
+    QFile pluginLink(qmldirPath.absoluteFilePath(baseName + QLatin1Char('d')));
+# else
+    QFile pluginLink(qmldirPath.absoluteFilePath(baseName));
+# endif
+
+    if (pluginLink.open(QIODevice::ReadOnly)) {
+        QTextStream in(&pluginLink);
+        newBaseName = in.readLine().trimmed();
+        pluginLink.close();
+    }
+
+    if (newBaseName.isEmpty())
+        newBaseName = baseName;
+
+    return resolvePlugin(qmldirPath, qmldirPluginPath, newBaseName,
+                         QStringList() << QLatin1String(".dll"));
+
 # else  // Generic Unix
     QStringList validSuffixList;
 
@@ -922 +942 @@
     //  libfoo.so
 
     return resolvePlugin(qmldirPath, qmldirPluginPath, baseName, validSuffixList, QLatin1String("lib"));
-# endif
 
 #endif
 }

src/imports/qimportbase.pri

@@ -2 +2 @@
 TEMPLATE = lib
 CONFIG += qt plugin
 
-win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
+os2|win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
 
 isEmpty(TARGETPATH) {
     error("qimportbase.pri: You must provide a TARGETPATH!")
@@ -26 +26 @@
 !isEmpty(TARGET_SHORT):TARGET_SHORT = $$qtLibraryTarget($$TARGET_SHORT)
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
+os2:!isEmpty(TARGET_SHORT) {
+    FOUR       = 4
+    PLUGINNAME = $$TARGET_SHORT
+    PLUGINLINK = $$QT_BUILD_TREE/imports/$$TARGETPATH/$$TARGET
+
+    createlink.target = $$PLUGINLINK
+    createlink.commands = echo $$PLUGINNAME$$FOUR > $$PLUGINLINK
+    createlink.depends = $$QMLDIRFILE
+    QMAKE_EXTRA_TARGETS += createlink
+    QMAKE_DISTCLEAN += $$PLUGINLINK
+    PRE_TARGETDEPS += $$PLUGINLINK
+
+    pluginlink.path = /imports/$$TARGETPATH
+    pluginlink.files = $$PLUGINLINK
+    INSTALLS += pluginlink
+}
+
 include(../qt_targets.pri)
 
 wince*:LIBS += $$QMAKE_LIBS_GUI