aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-03-19 09:06:52 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-03-19 11:06:53 +0000
commit3587d80d5a6f68150ec299ae16b5c4b63758e7f3 (patch)
treec0595c4b90a9b0eb03d6574444757dcb04a6243c /src/imports
parentf3a648f9a1d644b9f0cea10c7b0c965ca7331048 (diff)
Rename Qt Labs Controls to Qt Quick Controls 2 - config file
Change-Id: I39bf55cc4e07788722fa2a3962a3476495b83dc9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/controls/doc/src/qtlabscontrols-chattutorial.qdoc2
-rw-r--r--src/imports/controls/doc/src/qtlabscontrols-styles.qdoc4
2 files changed, 3 insertions, 3 deletions
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