Rename Qt Labs Controls to Qt Quick Controls 2 - config file

Change-Id: I39bf55cc4e07788722fa2a3962a3476495b83dc9
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

11 files changed, 8 insertions, 8 deletions

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 @@
         <file>main.qml</file>
         <file>ContactPage.qml</file>
         <file>ConversationPage.qml</file>
-        <file>qtlabscontrols.conf</file>
+        <file>qtquickcontrols.conf</file>
         <file>ChatToolBar.qml</file>
         <file>+material/ChatToolBar.qml</file>
     </qresource>
diff --git a/examples/controls/chattutorial/chapter5-styling/qtlabscontrols.conf b/examples/controls/chattutorial/chapter5-styling/qtquickcontrols.conf
index e338c804..e338c804 100644
--- a/examples/controls/chattutorial/chapter5-styling/qtlabscontrols.conf
+++ b/examples/controls/chattutorial/chapter5-styling/qtquickcontrols.conf
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 @@
 <RCC>
     <qresource prefix="/">
         <file>gallery.qml</file>
-        <file>qtlabscontrols.conf</file>
+        <file>qtquickcontrols.conf</file>
         <file>images/arrow.png</file>
         <file>images/arrow@2x.png</file>
         <file>images/arrow@3x.png</file>
diff --git a/examples/controls/gallery/qtlabscontrols.conf b/examples/controls/gallery/qtquickcontrols.conf
index 61375ac1..61375ac1 100644
--- a/examples/controls/gallery/qtlabscontrols.conf
+++ b/examples/controls/gallery/qtquickcontrols.conf
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<QSettings> 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
     <!DOCTYPE RCC><RCC version="1.0">
     <qresource prefix="/">
-        <file>qtlabscontrols.conf</file>
+        <file>qtquickcontrols.conf</file>
     </qresource>
     </RCC>
     \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 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-    <file>qtlabscontrols.conf</file>
+    <file>qtquickcontrols.conf</file>
 </qresource>
 </RCC>
diff --git a/tests/auto/material/qtlabscontrols.conf b/tests/auto/material/qtquickcontrols.conf
index b6c7c87e..b6c7c87e 100644
--- a/tests/auto/material/qtlabscontrols.conf
+++ b/tests/auto/material/qtquickcontrols.conf
diff --git a/tests/auto/universal/qtlabscontrols.conf b/tests/auto/universal/qtquickcontrols.conf
index 8c6dd807..8c6dd807 100644
--- a/tests/auto/universal/qtlabscontrols.conf
+++ b/tests/auto/universal/qtquickcontrols.conf
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 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-    <file>qtlabscontrols.conf</file>
+    <file>qtquickcontrols.conf</file>
 </qresource>
 </RCC>