summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2012-12-19 11:01:14 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-20 10:12:39 +0100
commite0718f3a05ef83f6a07570c3d62fce424da4bc28 (patch)
tree491ad2c072b7ad6ef2c1516df792eff3cbd3d46b
parent44cdbfa489e88be7f0b528f11b6ed1f557cef113 (diff)
Force importing static plugins for all binaries linking QtAxServer
Normally static plugins are only imported for applications, but any dll implementing an ActiveQt server also needs these imports, so add force_import_plugins to MODULE_CONFIG of QtAxServer. Task-number: QTBUG-28215 Change-Id: I7c221dfd08ca25ba1a9c5246ed4517d00737922f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--src/activeqt/control/control.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro
index 7541304..dfe86ea 100644
--- a/src/activeqt/control/control.pro
+++ b/src/activeqt/control/control.pro
@@ -21,7 +21,7 @@ SOURCES = qaxserver.cpp \
MODULE = axserver
MODULE_DEFINES = QAXSERVER
-MODULE_CONFIG = idcidl
+MODULE_CONFIG = idcidl force_import_plugins
CONFIG += no_module_headers
load(qt_module)
DEFINES -= QT_NO_CAST_TO_ASCII QT_USE_QSTRINGBUILDER