From 3587d80d5a6f68150ec299ae16b5c4b63758e7f3 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 19 Mar 2016 09:06:52 +0100 Subject: Rename Qt Labs Controls to Qt Quick Controls 2 - config file Change-Id: I39bf55cc4e07788722fa2a3962a3476495b83dc9 Reviewed-by: Mitch Curtis --- examples/controls/chattutorial/chapter5-styling/qml.qrc | 2 +- .../controls/chattutorial/chapter5-styling/qtlabscontrols.conf | 7 ------- .../controls/chattutorial/chapter5-styling/qtquickcontrols.conf | 7 +++++++ examples/controls/gallery/gallery.qrc | 2 +- examples/controls/gallery/qtlabscontrols.conf | 8 -------- examples/controls/gallery/qtquickcontrols.conf | 8 ++++++++ src/controls/qquickstyleattached.cpp | 2 +- src/imports/controls/doc/src/qtlabscontrols-chattutorial.qdoc | 2 +- src/imports/controls/doc/src/qtlabscontrols-styles.qdoc | 4 ++-- tests/auto/material/material.qrc | 2 +- tests/auto/material/qtlabscontrols.conf | 2 -- tests/auto/material/qtquickcontrols.conf | 2 ++ tests/auto/universal/qtlabscontrols.conf | 2 -- tests/auto/universal/qtquickcontrols.conf | 2 ++ tests/auto/universal/universal.qrc | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 examples/controls/chattutorial/chapter5-styling/qtlabscontrols.conf create mode 100644 examples/controls/chattutorial/chapter5-styling/qtquickcontrols.conf delete mode 100644 examples/controls/gallery/qtlabscontrols.conf create mode 100644 examples/controls/gallery/qtquickcontrols.conf delete mode 100644 tests/auto/material/qtlabscontrols.conf create mode 100644 tests/auto/material/qtquickcontrols.conf delete mode 100644 tests/auto/universal/qtlabscontrols.conf create mode 100644 tests/auto/universal/qtquickcontrols.conf diff --git a/examples/controls/chattutorial/chapter5-styling/qml.qrc b/examples/controls/chattutorial/chapter5-styling/qml.qrc index d2446409..eab2140a 100644 --- a/examples/controls/chattutorial/chapter5-styling/qml.qrc +++ b/examples/controls/chattutorial/chapter5-styling/qml.qrc @@ -3,7 +3,7 @@ main.qml ContactPage.qml ConversationPage.qml - qtlabscontrols.conf + qtquickcontrols.conf ChatToolBar.qml +material/ChatToolBar.qml diff --git a/examples/controls/chattutorial/chapter5-styling/qtlabscontrols.conf b/examples/controls/chattutorial/chapter5-styling/qtlabscontrols.conf deleted file mode 100644 index e338c804..00000000 --- a/examples/controls/chattutorial/chapter5-styling/qtlabscontrols.conf +++ /dev/null @@ -1,7 +0,0 @@ -[material] -Primary=Indigo -Accent=Indigo -Theme=Dark - -[Universal] -Theme=Dark diff --git a/examples/controls/chattutorial/chapter5-styling/qtquickcontrols.conf b/examples/controls/chattutorial/chapter5-styling/qtquickcontrols.conf new file mode 100644 index 00000000..e338c804 --- /dev/null +++ b/examples/controls/chattutorial/chapter5-styling/qtquickcontrols.conf @@ -0,0 +1,7 @@ +[material] +Primary=Indigo +Accent=Indigo +Theme=Dark + +[Universal] +Theme=Dark diff --git a/examples/controls/gallery/gallery.qrc b/examples/controls/gallery/gallery.qrc index e29c18ce..1b74b434 100644 --- a/examples/controls/gallery/gallery.qrc +++ b/examples/controls/gallery/gallery.qrc @@ -1,7 +1,7 @@ gallery.qml - qtlabscontrols.conf + qtquickcontrols.conf images/arrow.png images/arrow@2x.png images/arrow@3x.png diff --git a/examples/controls/gallery/qtlabscontrols.conf b/examples/controls/gallery/qtlabscontrols.conf deleted file mode 100644 index 61375ac1..00000000 --- a/examples/controls/gallery/qtlabscontrols.conf +++ /dev/null @@ -1,8 +0,0 @@ -[Material] -Primary=LightGreen -Accent=LightGreen -Theme=Light - -[Universal] -Accent=Green -Theme=Light diff --git a/examples/controls/gallery/qtquickcontrols.conf b/examples/controls/gallery/qtquickcontrols.conf new file mode 100644 index 00000000..61375ac1 --- /dev/null +++ b/examples/controls/gallery/qtquickcontrols.conf @@ -0,0 +1,8 @@ +[Material] +Primary=LightGreen +Accent=LightGreen +Theme=Light + +[Universal] +Accent=Green +Theme=Light diff --git a/src/controls/qquickstyleattached.cpp b/src/controls/qquickstyleattached.cpp index 7b93a0a5..0ac47ed1 100644 --- a/src/controls/qquickstyleattached.cpp +++ b/src/controls/qquickstyleattached.cpp @@ -170,7 +170,7 @@ QQuickStyleAttached::~QQuickStyleAttached() QSharedPointer QQuickStyleAttached::settings(const QString &group) { #ifndef QT_NO_SETTINGS - const QString filePath = QStringLiteral(":/qtlabscontrols.conf"); + const QString filePath = QStringLiteral(":/qtquickcontrols.conf"); if (QFile::exists(filePath)) { QFileSelector selector; QSettings *settings = new QSettings(selector.select(filePath), QSettings::IniFormat); diff --git a/src/imports/controls/doc/src/qtlabscontrols-chattutorial.qdoc b/src/imports/controls/doc/src/qtlabscontrols-chattutorial.qdoc index d52c6d40..53931f42 100644 --- a/src/imports/controls/doc/src/qtlabscontrols-chattutorial.qdoc +++ b/src/imports/controls/doc/src/qtlabscontrols-chattutorial.qdoc @@ -806,7 +806,7 @@ should be very few adjustments necessary when switching styles. Now let's try each style's dark theme. The Default style has no dark theme, as it would add a slight overhead to a style that is designed to be as performant as possible. We'll test out the Material style first, so add an entry to -\c qtlabscontrols.conf that tells it to use its dark theme: +\c qtquickcontrols.conf that tells it to use its dark theme: \code [material] diff --git a/src/imports/controls/doc/src/qtlabscontrols-styles.qdoc b/src/imports/controls/doc/src/qtlabscontrols-styles.qdoc index 3dc6ed03..166edd45 100644 --- a/src/imports/controls/doc/src/qtlabscontrols-styles.qdoc +++ b/src/imports/controls/doc/src/qtlabscontrols-styles.qdoc @@ -93,7 +93,7 @@ \section2 Configuration file - Qt Labs Controls support a special configuration file, \c :/qtlabscontrols.conf, + Qt Labs Controls support a special configuration file, \c :/qtquickcontrols.conf, that is built into an application's resources. The configuration file can specify the preferred style (may be overridden by either @@ -123,7 +123,7 @@ \code - qtlabscontrols.conf + qtquickcontrols.conf \endcode diff --git a/tests/auto/material/material.qrc b/tests/auto/material/material.qrc index 1df3aef9..f1398b2f 100644 --- a/tests/auto/material/material.qrc +++ b/tests/auto/material/material.qrc @@ -1,5 +1,5 @@ - qtlabscontrols.conf + qtquickcontrols.conf diff --git a/tests/auto/material/qtlabscontrols.conf b/tests/auto/material/qtlabscontrols.conf deleted file mode 100644 index b6c7c87e..00000000 --- a/tests/auto/material/qtlabscontrols.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Controls] -Style=Material diff --git a/tests/auto/material/qtquickcontrols.conf b/tests/auto/material/qtquickcontrols.conf new file mode 100644 index 00000000..b6c7c87e --- /dev/null +++ b/tests/auto/material/qtquickcontrols.conf @@ -0,0 +1,2 @@ +[Controls] +Style=Material diff --git a/tests/auto/universal/qtlabscontrols.conf b/tests/auto/universal/qtlabscontrols.conf deleted file mode 100644 index 8c6dd807..00000000 --- a/tests/auto/universal/qtlabscontrols.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Controls] -Style=Universal diff --git a/tests/auto/universal/qtquickcontrols.conf b/tests/auto/universal/qtquickcontrols.conf new file mode 100644 index 00000000..8c6dd807 --- /dev/null +++ b/tests/auto/universal/qtquickcontrols.conf @@ -0,0 +1,2 @@ +[Controls] +Style=Universal diff --git a/tests/auto/universal/universal.qrc b/tests/auto/universal/universal.qrc index 1df3aef9..f1398b2f 100644 --- a/tests/auto/universal/universal.qrc +++ b/tests/auto/universal/universal.qrc @@ -1,5 +1,5 @@ - qtlabscontrols.conf + qtquickcontrols.conf -- cgit v1.2.3