diff options
| author | Andy Shaw <andy.shaw@theqtcompany.com> | 2016-03-16 07:29:53 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@theqtcompany.com> | 2016-03-18 07:59:16 +0000 |
| commit | 463b8d7bb53ae5ea08ec6caafdf1754ca015603a (patch) | |
| tree | 6d7af249ef617fcef3086d8772f35d3f6af05c4b | |
| parent | b4c13916ec0fd7796acdf0ec5a1db0134479b3f2 (diff) | |
| download | qtquickcontrols-463b8d7bb53ae5ea08ec6caafdf1754ca015603a.tar.gz | |
Make the iOS style a plugin so that it can be built for static correctly
Change-Id: I60ae4aa9e0e1ffdc8f74a611202fef10df023b05
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| -rw-r--r-- | src/controls/Styles/iOS/iOS.pri | 27 | ||||
| -rw-r--r-- | src/controls/Styles/iOS/iOS.pro | 28 | ||||
| -rw-r--r-- | src/controls/Styles/styles.pri | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 |
4 files changed, 30 insertions, 29 deletions
diff --git a/src/controls/Styles/iOS/iOS.pri b/src/controls/Styles/iOS/iOS.pri new file mode 100644 index 00000000..ac878066 --- /dev/null +++ b/src/controls/Styles/iOS/iOS.pri @@ -0,0 +1,27 @@ +QML_FILES += \ + $$PWD/ApplicationWindowStyle.qml \ + $$PWD/BusyIndicatorStyle.qml \ + $$PWD/ButtonStyle.qml \ + $$PWD/CalendarStyle.qml \ + $$PWD/CheckBoxStyle.qml \ + $$PWD/ComboBoxStyle.qml \ + $$PWD/FocusFrameStyle.qml \ + $$PWD/GroupBoxStyle.qml \ + $$PWD/MenuBarStyle.qml \ + $$PWD/MenuStyle.qml \ + $$PWD/ProgressBarStyle.qml \ + $$PWD/RadioButtonStyle.qml \ + $$PWD/ScrollViewStyle.qml\ + $$PWD/SliderStyle.qml \ + $$PWD/SpinBoxStyle.qml \ + $$PWD/StatusBarStyle.qml \ + $$PWD/SwitchStyle.qml \ + $$PWD/TableViewStyle.qml \ + $$PWD/TabViewStyle.qml \ + $$PWD/TextAreaStyle.qml \ + $$PWD/TextFieldStyle.qml \ + $$PWD/ToolBarStyle.qml \ + $$PWD/ToolButtonStyle.qml \ + $$PWD/CursorHandleStyle.qml \ + $$PWD/SelectionHandleStyle.qml \ + $$PWD/CursorDelegate.qml diff --git a/src/controls/Styles/iOS/iOS.pro b/src/controls/Styles/iOS/iOS.pro index 886c1dc1..3fe6ff03 100644 --- a/src/controls/Styles/iOS/iOS.pro +++ b/src/controls/Styles/iOS/iOS.pro @@ -1,32 +1,6 @@ TARGETPATH = QtQuick/Controls/Styles/iOS IMPORT_VERSION = 1.0 -QML_FILES += \ - $$PWD/ApplicationWindowStyle.qml \ - $$PWD/BusyIndicatorStyle.qml \ - $$PWD/ButtonStyle.qml \ - $$PWD/CalendarStyle.qml \ - $$PWD/CheckBoxStyle.qml \ - $$PWD/ComboBoxStyle.qml \ - $$PWD/FocusFrameStyle.qml \ - $$PWD/GroupBoxStyle.qml \ - $$PWD/MenuBarStyle.qml \ - $$PWD/MenuStyle.qml \ - $$PWD/ProgressBarStyle.qml \ - $$PWD/RadioButtonStyle.qml \ - $$PWD/ScrollViewStyle.qml\ - $$PWD/SliderStyle.qml \ - $$PWD/SpinBoxStyle.qml \ - $$PWD/StatusBarStyle.qml \ - $$PWD/SwitchStyle.qml \ - $$PWD/TableViewStyle.qml \ - $$PWD/TabViewStyle.qml \ - $$PWD/TextAreaStyle.qml \ - $$PWD/TextFieldStyle.qml \ - $$PWD/ToolBarStyle.qml \ - $$PWD/ToolButtonStyle.qml \ - $$PWD/CursorHandleStyle.qml \ - $$PWD/SelectionHandleStyle.qml \ - $$PWD/CursorDelegate.qml +include(ios.pri) load(qml_module) diff --git a/src/controls/Styles/styles.pri b/src/controls/Styles/styles.pri index 365dd61a..5b2b61c2 100644 --- a/src/controls/Styles/styles.pri +++ b/src/controls/Styles/styles.pri @@ -109,5 +109,5 @@ STYLES_QML_FILES += \ $$PWD/Base/images/needle.png STYLES_QML_FILES += $$PWD/qmldir - +ios:static: include(iOS/ios.pri) !qtquickcompiler|static: QML_FILES += $$STYLES_QML_FILES diff --git a/src/src.pro b/src/src.pro index 3850a354..36a3bd44 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += controls android: SUBDIRS += controls/Styles/Android -ios: SUBDIRS += controls/Styles/iOS +ios:!static: SUBDIRS += controls/Styles/iOS winrt: SUBDIRS += controls/Styles/WinRT SUBDIRS += extras |