From 527406cbd99f44470ef87468b73c18df949e8ac7 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Mon, 12 Nov 2018 09:40:47 +0100
Subject: Modernize the "settings" feature

Change-Id: I9b8a61ecb1413b513ae5c9e77d3ee1b3e8b6562c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/corelib/io/qsettings.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/corelib/io/qsettings.h')

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
-- 
cgit v1.2.3