Rename qtquickcontrols.conf to qtquickcontrols2.conf

Use the 2-suffix consistently everywhere to avoid any potential
confusion with the old controls.

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

12 files changed, 12 insertions, 12 deletions

diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc b/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc
index eab2140a..6dcfb073 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc
@@ -3,7 +3,7 @@
         <file>main.qml</file>
         <file>ContactPage.qml</file>
         <file>ConversationPage.qml</file>
-        <file>qtquickcontrols.conf</file>
+        <file>qtquickcontrols2.conf</file>
         <file>ChatToolBar.qml</file>
         <file>+material/ChatToolBar.qml</file>
     </qresource>
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/qtquickcontrols.conf b/examples/quickcontrols2/chattutorial/chapter5-styling/qtquickcontrols2.conf
index e338c804..e338c804 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/qtquickcontrols.conf
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/qtquickcontrols2.conf
diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index e83f84c2..911ea811 100644
--- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-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 qtquickcontrols.conf that tells it to use its dark theme:
+\c qtquickcontrols2.conf that tells it to use its dark theme:
 
 \code
 [material]
diff --git a/examples/quickcontrols2/gallery/gallery.qrc b/examples/quickcontrols2/gallery/gallery.qrc
index ee4bf5b7..ba5fb595 100644
--- a/examples/quickcontrols2/gallery/gallery.qrc
+++ b/examples/quickcontrols2/gallery/gallery.qrc
@@ -1,7 +1,7 @@
 <RCC>
     <qresource prefix="/">
         <file>gallery.qml</file>
-        <file>qtquickcontrols.conf</file>
+        <file>qtquickcontrols2.conf</file>
         <file>images/arrow.png</file>
         <file>images/arrow@2x.png</file>
         <file>images/arrow@3x.png</file>
diff --git a/examples/quickcontrols2/gallery/qtquickcontrols.conf b/examples/quickcontrols2/gallery/qtquickcontrols2.conf
index 61375ac1..61375ac1 100644
--- a/examples/quickcontrols2/gallery/qtquickcontrols.conf
+++ b/examples/quickcontrols2/gallery/qtquickcontrols2.conf
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc
index 812a4611..3d944485 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc
@@ -45,9 +45,9 @@
     resources.qrc
     main.qml
     +windows/MyPage.qml
-    +windows/qtquickcontrols.conf
+    +windows/qtquickcontrols2.conf
     +android/MyPage.qml
-    +android/qtquickcontrols.conf
+    +android/qtquickcontrols2.conf
     \endcode
 
     In the project above, \c main.qml would import \c Qt.labs.controls, for
@@ -55,7 +55,7 @@
     that is style-specific is moved out into separate files; just as we've done
     for \c MyPage.qml.
 
-    The \c +windows/qtquickcontrols.conf file would contain configuration
+    The \c +windows/qtquickcontrols2.conf file would contain configuration
     options specific to the Universal style:
 
     \code
@@ -67,7 +67,7 @@
     Accent=Red
     \endcode
 
-    The \c +android/qtquickcontrols.conf file would contain configuration
+    The \c +android/qtquickcontrols2.conf file would contain configuration
     options specific to the Material style:
 
     \code
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
index 1939c577..78680519 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
@@ -94,7 +94,7 @@
     \section2 Configuration file
     \target qtquickcontrols2-conf
 
-    Qt Quick Controls 2 support a special configuration file, \c :/qtquickcontrols.conf,
+    Qt Quick Controls 2 support a special configuration file, \c :/qtquickcontrols2.conf,
     that is built into an application's resources.
 
     The configuration file can specify the preferred style (may be overridden by either
@@ -124,7 +124,7 @@
     \code
     <!DOCTYPE RCC><RCC version="1.0">
     <qresource prefix="/">
-        <file>qtquickcontrols.conf</file>
+        <file>qtquickcontrols2.conf</file>
     </qresource>
     </RCC>
     \endcode
diff --git a/src/quickcontrols2/qquickstyleattached.cpp b/src/quickcontrols2/qquickstyleattached.cpp
index 4430c562..8b035455 100644
--- a/src/quickcontrols2/qquickstyleattached.cpp
+++ b/src/quickcontrols2/qquickstyleattached.cpp
@@ -170,7 +170,7 @@ QQuickStyleAttached::~QQuickStyleAttached()
 QSharedPointer<QSettings> QQuickStyleAttached::settings(const QString &group)
 {
 #ifndef QT_NO_SETTINGS
-    const QString filePath = QStringLiteral(":/qtquickcontrols.conf");
+    const QString filePath = QStringLiteral(":/qtquickcontrols2.conf");
     if (QFile::exists(filePath)) {
         QFileSelector selector;
         QSettings *settings = new QSettings(selector.select(filePath), QSettings::IniFormat);
diff --git a/tests/auto/material/material.qrc b/tests/auto/material/material.qrc
index f1398b2f..53ba6450 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>qtquickcontrols.conf</file>
+    <file>qtquickcontrols2.conf</file>
 </qresource>
 </RCC>
diff --git a/tests/auto/material/qtquickcontrols.conf b/tests/auto/material/qtquickcontrols2.conf
index b6c7c87e..b6c7c87e 100644
--- a/tests/auto/material/qtquickcontrols.conf
+++ b/tests/auto/material/qtquickcontrols2.conf
diff --git a/tests/auto/universal/qtquickcontrols.conf b/tests/auto/universal/qtquickcontrols2.conf
index 8c6dd807..8c6dd807 100644
--- a/tests/auto/universal/qtquickcontrols.conf
+++ b/tests/auto/universal/qtquickcontrols2.conf
diff --git a/tests/auto/universal/universal.qrc b/tests/auto/universal/universal.qrc
index f1398b2f..53ba6450 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>qtquickcontrols.conf</file>
+    <file>qtquickcontrols2.conf</file>
 </qresource>
 </RCC>