diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp index 93de7933d4e..4eaacaab87f 100644 --- a/src/gui/kernel/qplatformdialoghelper.cpp +++ b/src/gui/kernel/qplatformdialoghelper.cpp @@ -8,9 +8,6 @@ #if QT_CONFIG(regularexpression) #include #endif -#if QT_CONFIG(settings) -#include -#endif #include #include #include @@ -242,8 +239,6 @@ public: enum { CustomColorCount = 16, StandardColorCount = 6 * 8 }; QColorDialogStaticData(); - inline void readSettings(); - inline void writeSettings() const; QRgb customRgb[CustomColorCount]; QRgb standardRgb[StandardColorCount]; @@ -258,31 +253,6 @@ QColorDialogStaticData::QColorDialogStaticData() : customSet(false) for (int b = 0; b < 3; ++b) standardRgb[i++] = qRgb(r * 255 / 3, g * 255 / 3, b * 255 / 2); std::fill(customRgb, customRgb + CustomColorCount, 0xffffffff); - readSettings(); -} - -void QColorDialogStaticData::readSettings() -{ -#if QT_CONFIG(settings) - const QSettings settings(QSettings::UserScope, QStringLiteral("QtProject")); - for (int i = 0; i < int(CustomColorCount); ++i) { - const QVariant v = settings.value("Qt/customColors/"_L1 + QString::number(i)); - if (v.isValid()) - customRgb[i] = v.toUInt(); - } -#endif -} - -void QColorDialogStaticData::writeSettings() const -{ -#if QT_CONFIG(settings) - if (customSet) { - const_cast(this)->customSet = false; - QSettings settings(QSettings::UserScope, QStringLiteral("QtProject")); - for (int i = 0; i < int(CustomColorCount); ++i) - settings.setValue("Qt/customColors/"_L1 + QString::number(i), customRgb[i]); - } -#endif } Q_GLOBAL_STATIC(QColorDialogStaticData, qColorDialogStaticData) @@ -291,8 +261,6 @@ class QColorDialogOptionsPrivate : public QSharedData { public: QColorDialogOptionsPrivate() = default; - // Write out settings around destruction of dialogs - ~QColorDialogOptionsPrivate() { qColorDialogStaticData()->writeSettings(); } QColorDialogOptions::ColorDialogOptions options; QString windowTitle;