summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qsettings.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-11-12 09:40:47 +0100
committerLiang Qi <liang.qi@qt.io>2018-11-15 17:20:15 +0000
commit527406cbd99f44470ef87468b73c18df949e8ac7 (patch)
tree4ee73cffee4bf8699ce45d902aa9b30c6ebb1cc4 /src/corelib/io/qsettings.h
parentcd201b2c2c2849fea0c5a38ffd979cd9d5b24997 (diff)
Modernize the "settings" feature
Change-Id: I9b8a61ecb1413b513ae5c9e77d3ee1b3e8b6562c Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/io/qsettings.h')
-rw-r--r--src/corelib/io/qsettings.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h
index ccfec787a6..7a9eebe11b 100644
--- a/src/corelib/io/qsettings.h
+++ b/src/corelib/io/qsettings.h
@@ -45,10 +45,7 @@
#include <QtCore/qstring.h>
#include <QtCore/qscopedpointer.h>
-QT_BEGIN_NAMESPACE
-QT_END_NAMESPACE
-
-#ifndef QT_NO_SETTINGS
+QT_REQUIRE_CONFIG(settings);
#include <ctype.h>
@@ -208,6 +205,4 @@ private:
QT_END_NAMESPACE
-#endif // QT_NO_SETTINGS
-
#endif // QSETTINGS_H