diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-27 11:22:57 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 13:33:14 +0200 |
| commit | 23c9d4c98f3c6729b56700edc1d7144b444b16db (patch) | |
| tree | 27b20ccbf3c101dbc7bcb1e509882b6c7fc75962 /tests/auto/corelib/plugin/qplugin/qplugin.pro | |
| parent | f69a5857d115786f44d053e68c36f74526020e82 (diff) | |
| parent | 0ef66e98ccf4946a0e4513ab5fc157df0f0aca4e (diff) | |
Merge branch '5.11' into dev
Conflicts:
qmake/library/qmakebuiltins.cpp
src/plugins/platforms/windows/qwindowstabletsupport.h
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/widgets/styles/qstylesheetstyle.cpp
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
Done-With: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e
Diffstat (limited to 'tests/auto/corelib/plugin/qplugin/qplugin.pro')
| -rw-r--r-- | tests/auto/corelib/plugin/qplugin/qplugin.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/corelib/plugin/qplugin/qplugin.pro b/tests/auto/corelib/plugin/qplugin/qplugin.pro index 5283c2d52b..96fc704c07 100644 --- a/tests/auto/corelib/plugin/qplugin/qplugin.pro +++ b/tests/auto/corelib/plugin/qplugin/qplugin.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -TESTPLUGINS = +TESTPLUGINS = invalidplugin win32 { contains(QT_CONFIG, debug): TESTPLUGINS += debugplugin @@ -8,7 +8,7 @@ win32 { CONFIG(debug, debug|release): TESTPLUGINS += debugplugin CONFIG(release, debug|release): TESTPLUGINS += releaseplugin } else { - TESTPLUGINS = debugplugin releaseplugin + TESTPLUGINS += debugplugin releaseplugin } SUBDIRS += main $$TESTPLUGINS |