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.cpp | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 580fe6caf3..68e77c4167 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -41,8 +41,6 @@
 #include "qplatformdefs.h"
 #include "qsettings.h"
 
-#ifndef QT_NO_SETTINGS
-
 #include "qsettings_p.h"
 #include "qcache.h"
 #include "qfile.h"
@@ -3573,5 +3571,3 @@ QT_END_NAMESPACE
 #ifndef QT_BOOTSTRAPPED
 #include "moc_qsettings.cpp"
 #endif
-
-#endif // QT_NO_SETTINGS
-- 
cgit v1.2.3