summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-02-15 13:13:47 +0100
committerUlf Hermann <ulf.hermann@qt.io>2017-02-22 15:53:13 +0000
commit46730ca610d6a53a350c316cf55bc88f2f8c432f (patch)
treea6f7c2324ddfa345a5c13fbcc053b2e448734426 /tests
parent1d44b6bedbc50c565487fbda6564f3e81c5d4bd0 (diff)
Make the factoryloader test compile without library support
We define QT_STATICPLUGIN for the plugins in this case, so that they define the factory functions needed to link them directly into the test. Change-Id: I0f2de7bf6bec5a6d53ec9ad92536817c1221b7d5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.pro2
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/plugin2/plugin2.pro2
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.pro b/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.pro
index 132f01092a..44ef12db29 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.pro
+++ b/tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.pro
@@ -7,6 +7,8 @@ TARGET = $$qtLibraryTarget(plugin1)
DESTDIR = ../bin
winrt:include(../winrt.pri)
+!qtConfig(library): DEFINES += QT_STATICPLUGIN
+
# This is testdata for the tst_qpluginloader test.
target.path = $$[QT_INSTALL_TESTS]/tst_qfactoryloader/bin
INSTALLS += target
diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin2/plugin2.pro b/tests/auto/corelib/plugin/qfactoryloader/plugin2/plugin2.pro
index b47ed91535..5689919108 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/plugin2/plugin2.pro
+++ b/tests/auto/corelib/plugin/qfactoryloader/plugin2/plugin2.pro
@@ -7,6 +7,8 @@ TARGET = $$qtLibraryTarget(plugin2)
DESTDIR = ../bin
winrt:include(../winrt.pri)
+!qtConfig(library): DEFINES += QT_STATICPLUGIN
+
# This is testdata for the tst_qpluginloader test.
target.path = $$[QT_INSTALL_TESTS]/tst_qfactoryloader/bin
INSTALLS += target