diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-07-19 18:18:05 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-07-19 18:34:23 +0200 |
| commit | ca73389c6a2afd7e88a9bd16333c27fc82fb5c61 (patch) | |
| tree | 994d5dbdc2be692baf233601c2f3916981987c97 /tests | |
| parent | 8a13f087d3c0c7b9010b9861890b27a17889aeaa (diff) | |
| parent | ca56fb96dd2228404c3f51691bb78a9f2419f319 (diff) | |
| download | qtquickcontrols-ca73389c6a2afd7e88a9bd16333c27fc82fb5c61.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: Icc15fe685e94dd043979b6b9c6a624f18f2d1e4c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/activeFocusOnTab/activeFocusOnTab.pro | 2 | ||||
| -rw-r--r-- | tests/auto/controls/controls.pro | 2 | ||||
| -rw-r--r-- | tests/auto/testplugin/testplugin.pro | 2 | ||||
| -rw-r--r-- | tests/manual/combobox/combobox.pro | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/activeFocusOnTab/activeFocusOnTab.pro b/tests/auto/activeFocusOnTab/activeFocusOnTab.pro index d47a92e8..47b14865 100644 --- a/tests/auto/activeFocusOnTab/activeFocusOnTab.pro +++ b/tests/auto/activeFocusOnTab/activeFocusOnTab.pro @@ -9,5 +9,5 @@ include (../shared/util.pri) TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib -!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets +!no_desktop: QT += widgets DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/controls/controls.pro b/tests/auto/controls/controls.pro index dad036a2..c3f00094 100644 --- a/tests/auto/controls/controls.pro +++ b/tests/auto/controls/controls.pro @@ -3,7 +3,7 @@ TARGET = tst_controls IMPORTPATH = $$OUT_PWD/../testplugin -!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets +!no_desktop: QT += widgets CONFIG += qmltestcase console diff --git a/tests/auto/testplugin/testplugin.pro b/tests/auto/testplugin/testplugin.pro index 2b34ae77..3914c7ee 100644 --- a/tests/auto/testplugin/testplugin.pro +++ b/tests/auto/testplugin/testplugin.pro @@ -4,7 +4,7 @@ TARGET = testplugin TARGETPATH = QtQuickControlsTests QT += qml quick core-private gui-private -!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets +!no_desktop: QT += widgets QMLDIR = $$PWD/$$TARGETPATH/qmldir diff --git a/tests/manual/combobox/combobox.pro b/tests/manual/combobox/combobox.pro index 7d4a347f..89c89627 100644 --- a/tests/manual/combobox/combobox.pro +++ b/tests/manual/combobox/combobox.pro @@ -1,6 +1,6 @@ QT += qml quick TARGET = combobox -!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets +!no_desktop: QT += widgets SOURCES += $$PWD/main.cpp |