diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-20 22:41:57 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 05:43:19 +0000 |
| commit | e358a033d46056d646c27c09cf956c9699e5ff75 (patch) | |
| tree | 90463f6c3ff231834804ec46d79f561882ed17cc /src/quickcontrols2/qquickstyleattached.cpp | |
| parent | 05f6b386f9e49d263c47a1b5cce668bbc964f32e (diff) | |
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>
Diffstat (limited to 'src/quickcontrols2/qquickstyleattached.cpp')
| -rw-r--r-- | src/quickcontrols2/qquickstyleattached.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |