diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-25 10:27:39 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-25 10:27:39 +0200 |
commit | 91caf7531476d16c1c7a6d22705cb36ac93c5ab7 (patch) | |
tree | e4f67bcd61c55ba2b8cb4a4d01b10f69837c74e8 /tests/manual | |
parent | 1f0def9e8feca180680c1344cef6cf250b7630ba (diff) | |
parent | 6b876b21cd23f2af879543edf773dac41b4d0e97 (diff) | |
download | qtquickcontrols-91caf7531476d16c1c7a6d22705cb36ac93c5ab7.tar.gz |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
src/controls/Styles/Desktop/SpinBoxStyle.qml
Change-Id: Ia501c1388a2af9f273ec2742abbfc766717ad9e6
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/combobox/combobox.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/combobox/combobox.pro b/tests/manual/combobox/combobox.pro index 249e8ca4..7d4a347f 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: qtHaveModule(widgets): QT += widgets +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets SOURCES += $$PWD/main.cpp |