diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-07-17 22:52:39 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-07-18 12:01:27 +0200 |
| commit | cd952b14e1bc41aa3e6f97596dc32b6578df40bf (patch) | |
| tree | 9ff243cf8d76a740d01987797fd93177e9c5bf92 | |
| parent | 8ac9c0c3dfcec06f4d39b8616c2bf2b8048f694c (diff) | |
| download | qtquickcontrols-cd952b14e1bc41aa3e6f97596dc32b6578df40bf.tar.gz | |
Do not embed the Desktop style into resources on irrelevant platforms
The Desktop style is not built on these touch/mobile platforms, or when
QtWidgets is not enabled, so it's pointless to embed these QML files.
Change-Id: Iac11473b3a9791745a107e0f7ac1cd34a91a9a5d
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| -rw-r--r-- | src/controls/Styles/styles.pri | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/src/controls/Styles/styles.pri b/src/controls/Styles/styles.pri index ddc867a5..090fe22a 100644 --- a/src/controls/Styles/styles.pri +++ b/src/controls/Styles/styles.pri @@ -25,31 +25,33 @@ STYLES_QML_FILES = \ $$PWD/Base/ToolButtonStyle.qml # Desktop -STYLES_QML_FILES += \ - $$PWD/Desktop/qmldir \ - $$PWD/Desktop/RowItemSingleton.qml \ - $$PWD/Desktop/ButtonStyle.qml \ - $$PWD/Desktop/CalendarStyle.qml \ - $$PWD/Desktop/BusyIndicatorStyle.qml \ - $$PWD/Desktop/CheckBoxStyle.qml \ - $$PWD/Desktop/ComboBoxStyle.qml \ - $$PWD/Desktop/FocusFrameStyle.qml \ - $$PWD/Desktop/GroupBoxStyle.qml \ - $$PWD/Desktop/MenuBarStyle.qml \ - $$PWD/Desktop/MenuStyle.qml \ - $$PWD/Desktop/ProgressBarStyle.qml \ - $$PWD/Desktop/RadioButtonStyle.qml \ - $$PWD/Desktop/ScrollViewStyle.qml \ - $$PWD/Desktop/SliderStyle.qml \ - $$PWD/Desktop/SpinBoxStyle.qml \ - $$PWD/Desktop/SwitchStyle.qml \ - $$PWD/Desktop/StatusBarStyle.qml\ - $$PWD/Desktop/TabViewStyle.qml \ - $$PWD/Desktop/TableViewStyle.qml \ - $$PWD/Desktop/TextAreaStyle.qml \ - $$PWD/Desktop/TextFieldStyle.qml \ - $$PWD/Desktop/ToolBarStyle.qml \ - $$PWD/Desktop/ToolButtonStyle.qml +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets) { + STYLES_QML_FILES += \ + $$PWD/Desktop/qmldir \ + $$PWD/Desktop/RowItemSingleton.qml \ + $$PWD/Desktop/ButtonStyle.qml \ + $$PWD/Desktop/CalendarStyle.qml \ + $$PWD/Desktop/BusyIndicatorStyle.qml \ + $$PWD/Desktop/CheckBoxStyle.qml \ + $$PWD/Desktop/ComboBoxStyle.qml \ + $$PWD/Desktop/FocusFrameStyle.qml \ + $$PWD/Desktop/GroupBoxStyle.qml \ + $$PWD/Desktop/MenuBarStyle.qml \ + $$PWD/Desktop/MenuStyle.qml \ + $$PWD/Desktop/ProgressBarStyle.qml \ + $$PWD/Desktop/RadioButtonStyle.qml \ + $$PWD/Desktop/ScrollViewStyle.qml \ + $$PWD/Desktop/SliderStyle.qml \ + $$PWD/Desktop/SpinBoxStyle.qml \ + $$PWD/Desktop/SwitchStyle.qml \ + $$PWD/Desktop/StatusBarStyle.qml\ + $$PWD/Desktop/TabViewStyle.qml \ + $$PWD/Desktop/TableViewStyle.qml \ + $$PWD/Desktop/TextAreaStyle.qml \ + $$PWD/Desktop/TextFieldStyle.qml \ + $$PWD/Desktop/ToolBarStyle.qml \ + $$PWD/Desktop/ToolButtonStyle.qml +} # Images STYLES_QML_FILES += \ |