diff options
| -rw-r--r-- | examples/testapp/testapp.pro | 7 | ||||
| -rw-r--r-- | installerbuilder/installerbase/installerbase.pro | 9 | ||||
| -rw-r--r-- | installerbuilder/libinstaller/libinstaller.pri | 7 | ||||
| -rw-r--r-- | installerbuilder/libinstaller/libinstaller.pro | 7 |
4 files changed, 9 insertions, 21 deletions
diff --git a/examples/testapp/testapp.pro b/examples/testapp/testapp.pro index 235dccf76..4b1ada531 100644 --- a/examples/testapp/testapp.pro +++ b/examples/testapp/testapp.pro @@ -9,11 +9,8 @@ DESTDIR = packages/com.nokia.testapp/data QT += script network xml sql CONFIG += uitools help contains(CONFIG, static): { - SQLPLUGINS = $$unique(sql-plugins) - contains(SQLPLUGINS, sqlite): { - QTPLUGIN += qsqlite - DEFINES += USE_STATIC_SQLITE_PLUGIN - } + QTPLUGIN += qsqlite + DEFINES += USE_STATIC_SQLITE_PLUGIN } # Input diff --git a/installerbuilder/installerbase/installerbase.pro b/installerbuilder/installerbase/installerbase.pro index 6719e9967..29376068a 100644 --- a/installerbuilder/installerbase/installerbase.pro +++ b/installerbuilder/installerbase/installerbase.pro @@ -11,15 +11,12 @@ win32:RC_FILE = installerbase.rc DESTDIR = ../bin CONFIG += help + contains(CONFIG, static): { - SQLPLUGINS = $$unique(sql-plugins) - contains(SQLPLUGINS, sqlite): { - QTPLUGIN += qsqlite - DEFINES += USE_STATIC_SQLITE_PLUGIN - } + QTPLUGIN += qsqlite + DEFINES += USE_STATIC_SQLITE_PLUGIN } - CONFIG -= app_bundle include(../libinstaller/libinstaller.pri) diff --git a/installerbuilder/libinstaller/libinstaller.pri b/installerbuilder/libinstaller/libinstaller.pri index 8011cf426..8a23e1c15 100644 --- a/installerbuilder/libinstaller/libinstaller.pri +++ b/installerbuilder/libinstaller/libinstaller.pri @@ -21,11 +21,8 @@ CONFIG( shared, static|shared ):DEFINES += KDTOOLS_SHARED CONFIG += uitools help contains(CONFIG, static): { - SQLPLUGINS = $$unique(sql-plugins) - contains(SQLPLUGINS, sqlite): { - QTPLUGIN += qsqlite - DEFINES += USE_STATIC_SQLITE_PLUGIN - } + QTPLUGIN += qsqlite + DEFINES += USE_STATIC_SQLITE_PLUGIN } QT += script diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro index 030912cb9..49e887f6d 100644 --- a/installerbuilder/libinstaller/libinstaller.pro +++ b/installerbuilder/libinstaller/libinstaller.pro @@ -25,11 +25,8 @@ QT += script \ CONFIG += help uitools contains(CONFIG, static): { - SQLPLUGINS = $$unique(sql-plugins) - contains(SQLPLUGINS, sqlite): { - QTPLUGIN += qsqlite - DEFINES += USE_STATIC_SQLITE_PLUGIN - } + QTPLUGIN += qsqlite + DEFINES += USE_STATIC_SQLITE_PLUGIN } include(3rdparty/p7zip_9.04/p7zip.pri) |