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/io.pri | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'src/corelib/io/io.pri')

diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index c6a5407e51..086d642c26 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -34,8 +34,6 @@ HEADERS +=  \
         io/qurlquery.h \
         io/qurltlds_p.h \
         io/qtldurl_p.h \
-        io/qsettings.h \
-        io/qsettings_p.h \
         io/qfsfileengine_p.h \
         io/qfsfileengine_iterator_p.h \
         io/qfilesystementry_p.h \
@@ -73,7 +71,6 @@ SOURCES += \
         io/qurlidna.cpp \
         io/qurlquery.cpp \
         io/qurlrecode.cpp \
-        io/qsettings.cpp \
         io/qfsfileengine.cpp \
         io/qfsfileengine_iterator.cpp \
         io/qfilesystementry.cpp \
@@ -121,6 +118,24 @@ qtConfig(processenvironment) {
         SOURCES += io/qprocess_unix.cpp
 }
 
+qtConfig(settings) {
+    SOURCES += \
+        io/qsettings.cpp
+    HEADERS += \
+        io/qsettings.h \
+        io/qsettings_p.h
+
+    win32 {
+        !winrt {
+            SOURCES += io/qsettings_win.cpp
+        } else {
+            SOURCES += io/qsettings_winrt.cpp
+        }
+    } else: darwin:!nacl {
+        SOURCES += io/qsettings_mac.cpp
+    }
+}
+
 win32 {
         SOURCES += io/qfsfileengine_win.cpp
         SOURCES += io/qlockfile_win.cpp
@@ -136,7 +151,6 @@ win32 {
             io/qwindowspipewriter_p.h
 
         SOURCES += \
-            io/qsettings_win.cpp \
             io/qstandardpaths_win.cpp \
             io/qstorageinfo_win.cpp \
             io/qwindowspipereader.cpp \
@@ -146,7 +160,6 @@ win32 {
     } else {
         SOURCES += \
                 io/qstandardpaths_winrt.cpp \
-                io/qsettings_winrt.cpp \
                 io/qstorageinfo_stub.cpp
     }
 } else:unix {
@@ -162,9 +175,6 @@ win32 {
                      ../3rdparty/forkfd/forkfd.h
             INCLUDEPATH += ../3rdparty/forkfd
         }
-        !nacl:mac: {
-            SOURCES += io/qsettings_mac.cpp
-        }
         mac {
             SOURCES += io/qstorageinfo_mac.cpp
             qtConfig(processenvironment): \
-- 
cgit v1.2.3