From f212e46fe930ee89a8cb52beeeccc03369c015a1 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 19 Mar 2013 12:27:48 +0100
Subject: [PATCH] Assistant: Fix static linking for Linux.
main.cpp:78: undefined reference to `qt_static_plugin_qsqlite()'
The import for the DB plugin should now be generated by qmake.
Change-Id: I9da25aea8667ca34221427236b8e1d36be77da8b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
---
src/assistant/assistant/assistant.pro | 8 +-------
src/assistant/assistant/main.cpp | 5 -----
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
index 1ad63f0a1..25e423883 100644
--- a/src/assistant/assistant/assistant.pro
+++ b/src/assistant/assistant/assistant.pro
@@ -107,13 +107,7 @@ mac {
QMAKE_INFO_PLIST = Info_mac.plist
}
-contains(QT_CONFIG, static): {
- SQLPLUGINS = $$unique(sql-plugins)
- contains(SQLPLUGINS, sqlite): {
- QTPLUGIN += qsqlite
- DEFINES += USE_STATIC_SQLITE_PLUGIN
- }
-}
+QTPLUGIN += qsqlite
target.path=$$[QT_INSTALL_BINS]
INSTALLS += target
diff --git a/src/assistant/assistant/main.cpp b/src/assistant/assistant/main.cpp
index fabad3b51..a9074fc98 100644
--- a/src/assistant/assistant/main.cpp
+++ b/src/assistant/assistant/main.cpp
@@ -73,11 +73,6 @@
QT_USE_NAMESPACE
-#if defined(USE_STATIC_SQLITE_PLUGIN)
- #include <QtPlugin>
- Q_IMPORT_PLUGIN(qsqlite)
-#endif
-
namespace {
void
--
GitLab