Build fix for dynamic linkage.

Review-by: Maurice Kalinowski, Niels Weber

4 files changed, 26 insertions, 6 deletions

diff --git a/installerbuilder/installerbase/installerbase.pro b/installerbuilder/installerbase/installerbase.pro
index 1e34560c7..6719e9967 100644
--- a/installerbuilder/installerbase/installerbase.pro
+++ b/installerbuilder/installerbase/installerbase.pro
@@ -11,7 +11,14 @@ win32:RC_FILE = installerbase.rc
 DESTDIR = ../bin
 
 CONFIG += help
-QTPLUGIN += qsqlite
+contains(CONFIG, static): {
+    SQLPLUGINS = $$unique(sql-plugins)
+    contains(SQLPLUGINS, sqlite): {
+        QTPLUGIN += qsqlite
+        DEFINES += USE_STATIC_SQLITE_PLUGIN
+    }
+}
+
 
 CONFIG -= app_bundle
 
diff --git a/installerbuilder/libinstaller/init.cpp b/installerbuilder/libinstaller/init.cpp
index dccc508bd..f5006c759 100644
--- a/installerbuilder/libinstaller/init.cpp
+++ b/installerbuilder/libinstaller/init.cpp
@@ -148,7 +148,7 @@ static void initResources()
 {
     Q_INIT_RESOURCE( openssl );
     Q_INIT_RESOURCE( patch_file_lists );
-#if !defined( QT_SHARED ) && !defined( QT_DLL )
+#if defined(USE_STATIC_SQLITE_PLUGIN)
     Q_IMPORT_PLUGIN( qsqlite ); //RegisterDocumentationOperation needs this
 #endif
 }
diff --git a/installerbuilder/libinstaller/libinstaller.pri b/installerbuilder/libinstaller/libinstaller.pri
index afede9b97..8011cf426 100644
--- a/installerbuilder/libinstaller/libinstaller.pri
+++ b/installerbuilder/libinstaller/libinstaller.pri
@@ -13,13 +13,20 @@ DEPENDPATH += $$PWD \
     $$PWD/3rdparty/p7zip_9.04 \
     $$PWD/3rdparty/p7zip_9.04/unix/CPP \
     $$PWD/3rdparty/kdtools/KDUpdater \
-    $$PWD/3rdparty/kdtools/KDToolsCore \              
+    $$PWD/3rdparty/kdtools/KDToolsCore \
 
 CONFIG( shared, static|shared ):DEFINES += LIB_INSTALLER_SHARED
 CONFIG( shared, static|shared ):DEFINES += KDTOOLS_SHARED
 
 CONFIG += uitools help
-QTPLUGIN += qsqlite
+
+contains(CONFIG, static): {
+    SQLPLUGINS = $$unique(sql-plugins)
+    contains(SQLPLUGINS, sqlite): {
+        QTPLUGIN += qsqlite
+        DEFINES += USE_STATIC_SQLITE_PLUGIN
+    }
+}
 
 QT += script
 QT += gui # gui needed for KDUpdater include (compareVersion), which indirectly include QTreeWidget
diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro
index eff00019a..030912cb9 100644
--- a/installerbuilder/libinstaller/libinstaller.pro
+++ b/installerbuilder/libinstaller/libinstaller.pro
@@ -13,7 +13,7 @@ DESTDIR = $$OUT_PWD/../lib
 DLLDESTDIR = $$OUT_PWD/../bin
 
 DEFINES += QT_NO_CAST_FROM_ASCII \
-    BUILD_LIB_INSTALLER 
+    BUILD_LIB_INSTALLER
 
 CONFIG( shared, static|shared ){
     DEFINES += KDTOOLS_SHARED
@@ -24,7 +24,13 @@ QT += script \
     sql
 CONFIG += help uitools
 
-QTPLUGIN += qsqlite
+contains(CONFIG, static): {
+    SQLPLUGINS = $$unique(sql-plugins)
+    contains(SQLPLUGINS, sqlite): {
+        QTPLUGIN += qsqlite
+        DEFINES += USE_STATIC_SQLITE_PLUGIN
+    }
+}
 
 include(3rdparty/p7zip_9.04/p7zip.pri)
 include(3rdparty/kdtools/KDUpdater/KDUpdater.pri)