diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-24 19:57:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-24 20:01:42 +0100 |
| commit | de49839df8abfba1f3ed3c36ef3177e4a9d6ef00 (patch) | |
| tree | 71e777ca1e33c58edd9149821e970495ef4b75b2 /tests/auto/corelib/plugin | |
| parent | e6234535929c67e7fbfa1ad7ce88f37df0b68d45 (diff) | |
| parent | 4d3781b640e8fb0a04e96b2d05199247556b8d86 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
mkspecs/features/moc.prf
Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b
Diffstat (limited to 'tests/auto/corelib/plugin')
| -rw-r--r-- | tests/auto/corelib/plugin/qfactoryloader/plugin1/plugin1.pro | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/plugin/qfactoryloader/plugin2/plugin2.pro | 2 |
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 |