diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-04-02 22:17:36 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-10 22:47:37 +0200 |
| commit | 880cbf602701b0116ca1143d6d07ee8e7eb3f03f (patch) | |
| tree | de9eb090b3568443e95f7f3c26a9c35ec2a16bef /src/corelib/io/qsettings.h | |
| parent | 766498083a4d3f1db28604ea5d5f0da613f3839b (diff) | |
Bump some Qt 5 to-do's to Qt 6.
Source-incompatible changes are no longer desirable for Qt 5, so these
items must wait until at least Qt 6.
Task-number: QTBUG-23524
Change-Id: I0b9ae5f6f3a792e0169a4b0d3aefbdcb744acd2f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/io/qsettings.h')
| -rw-r--r-- | src/corelib/io/qsettings.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index a4bb8349a8..ca3fe245ea 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -173,8 +173,8 @@ public: static void setDefaultFormat(Format format); static Format defaultFormat(); - static void setSystemIniPath(const QString &dir); // ### remove in 5.0 (use setPath() instead) - static void setUserIniPath(const QString &dir); // ### remove in 5.0 (use setPath() instead) + static void setSystemIniPath(const QString &dir); // ### Qt 6: remove (use setPath() instead) + static void setUserIniPath(const QString &dir); // ### Qt 6: remove (use setPath() instead) static void setPath(Format format, Scope scope, const QString &path); typedef QMap<QString, QVariant> SettingsMap; |