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 /src/controls/Private/private.pri | |
| 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 'src/controls/Private/private.pri')
| -rw-r--r-- | src/controls/Private/private.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/controls/Private/private.pri b/src/controls/Private/private.pri index f2da1ec9..e409ee4a 100644 --- a/src/controls/Private/private.pri +++ b/src/controls/Private/private.pri @@ -22,7 +22,7 @@ SOURCES += \ $$PWD/qquickabstractstyle.cpp -!android: !ios: !blackberry: qtHaveModule(widgets) { +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets) { QT += widgets HEADERS += $$PWD/qquickstyleitem_p.h SOURCES += $$PWD/qquickstyleitem.cpp @@ -46,6 +46,7 @@ PRIVATE_QML_FILES += \ $$PWD/StackView.js \ $$PWD/ScrollViewHelper.qml \ $$PWD/ScrollBar.qml \ + $$PWD/SystemPaletteSingleton.qml \ $$PWD/TableViewSelection.qml \ $$PWD/TextHandle.qml \ $$PWD/TextSingleton.qml \ |