From f0c227f8a9a5c5e3ed83f86702626092457175aa Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 17 Feb 2015 13:53:44 +0100 Subject: Merge Extras' styling system into Controls'. - Removes the duplicated style settings functionality in Extras and simplifies the installed styles directory structure. - Extras' Base style is now part of Controls' Base style, eliminating the need for a separate QtQuick.Extras.Styles import. The cost of doing this should be negligible: a few QML files and two images. If we didn't merge Extras' Baste style into Controls', we'd need extras-specific code in qquickcontrolssettings, as the default style search path is: qml/QtQuick/Controls/Styles/ Whereas the Extras Base style would be in: qml/QtQuick/Extras/Styles/ The Extras Base style can't go into Controls' Base style directory, either, because otherwise we'd have two qmldir files there. The Flat style doesn't have this problem because it is all contained in one plugin and gets installed into its own Flat/ folder. - Documentation now lists the Extras controls as \since QtQuick.Extras 1.4. - Adds the customcontrolsstyle auto test to ensure that custom styling is tested. Change-Id: I19ca7a8b7e1c1daa85b272f4ccf9a2f05c76e0d9 Reviewed-by: Caroline Chao Reviewed-by: J-P Nurmi --- src/controls/controls.pro | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/controls/controls.pro') diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 151ccb4b..7261b5c6 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -43,6 +43,8 @@ QML_FILES += $$CONTROLS_QML_FILES SOURCES += $$PWD/plugin.cpp HEADERS += $$PWD/plugin.h +OTHER_FILES += doc/src/* + include(plugin.pri) include(Private/private.pri) include(Styles/styles.pri) -- cgit v1.2.1