aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols2/qquickstyleattached.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-03-21 16:42:51 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-03-22 11:17:09 +0000
commitf7c0efb42bd7f8b331525b42ec16536c1b4862f9 (patch)
tree8042f90d11b436e72ccc744981204c3c56ff1f03 /src/quickcontrols2/qquickstyleattached.cpp
parent7b4a33a571f1b02736ce7b82c69c9121e21876d3 (diff)
Move settings from QQuickStyleAttached to QQuickStylePrivate
The settings were added before QQuickStyle(Private) existed. Now QQuickStyle(Private) is a lot more logical place for the settings that are not specific to the attached style attributes only, but can be also determine which style is used etc. Change-Id: I7bc432c330d58ab501b51b0ee8eaf24697155324 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quickcontrols2/qquickstyleattached.cpp')
-rw-r--r--src/quickcontrols2/qquickstyleattached.cpp19
1 files changed, 0 insertions, 19 deletions
diff --git a/src/quickcontrols2/qquickstyleattached.cpp b/src/quickcontrols2/qquickstyleattached.cpp
index b9a66169..fd02790f 100644
--- a/src/quickcontrols2/qquickstyleattached.cpp
+++ b/src/quickcontrols2/qquickstyleattached.cpp
@@ -35,11 +35,7 @@
****************************************************************************/
#include "qquickstyleattached_p.h"
-#include "qquickstyle_p.h"
-#include <QtCore/qfile.h>
-#include <QtCore/qsettings.h>
-#include <QtCore/qfileselector.h>
#include <QtGui/qcolor.h>
#include <QtGui/qpalette.h>
#include <QtGui/private/qguiapplication_p.h>
@@ -194,21 +190,6 @@ QQuickStyleAttached::~QQuickStyleAttached()
setParentStyle(nullptr);
}
-QSharedPointer<QSettings> QQuickStyleAttached::settings(const QString &group)
-{
-#ifndef QT_NO_SETTINGS
- const QString filePath = QQuickStylePrivate::configFilePath();
- if (QFile::exists(filePath)) {
- QFileSelector selector;
- QSettings *settings = new QSettings(selector.select(filePath), QSettings::IniFormat);
- if (!group.isEmpty())
- settings->beginGroup(group);
- return QSharedPointer<QSettings>(settings);
- }
-#endif // QT_NO_SETTINGS
- return QSharedPointer<QSettings>();
-}
-
QList<QQuickStyleAttached *> QQuickStyleAttached::childStyles() const
{
return m_childStyles;