diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc | 8 | ||||
-rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc | 4 | ||||
-rw-r--r-- | src/quickcontrols2/qquickstyleattached.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
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); |