aboutsummaryrefslogtreecommitdiffstats
path: root/src/controls
diff options
context:
space:
mode:
authorAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-01-18 14:52:44 +0300
committerAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-01-18 12:39:58 +0000
commit08a8873e49cf0e9801f47825d0e82f47437e0226 (patch)
treefc52cb7d5fbc6a0dd4525d0499c25e0c04a8a808 /src/controls
parentb373350b3356633cdd068dfab6288574acd1b4a3 (diff)
QQuickStyle: remove global constant SettingsFilePath
and use QStringLiteral in settings() function Change-Id: I6a7d94f8ab07a3e77df858f25ba585165c951b24 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls')
-rw-r--r--src/controls/qquickstyle.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/controls/qquickstyle.cpp b/src/controls/qquickstyle.cpp
index 7f788e95..a44c8c99 100644
--- a/src/controls/qquickstyle.cpp
+++ b/src/controls/qquickstyle.cpp
@@ -44,8 +44,6 @@
QT_BEGIN_NAMESPACE
-static const char *SettingsFilePath = ":/qtlabscontrols.conf";
-
static QQuickStyle *attachedStyle(const QMetaObject *type, QObject *object, bool create = false)
{
if (!object)
@@ -170,7 +168,7 @@ QQuickStyle::~QQuickStyle()
QSharedPointer<QSettings> QQuickStyle::settings(const QString &group)
{
#ifndef QT_NO_SETTINGS
- const QString filePath = QLatin1String(SettingsFilePath);
+ const QString filePath = QStringLiteral(":/qtlabscontrols.conf");
if (QFile::exists(filePath)) {
QFileSelector selector;
QSettings *settings = new QSettings(selector.select(filePath), QSettings::IniFormat);