Merge remote-tracking branch 'origin/dev' into stable

Change-Id: Ice524edcc51373509f0023ae7f7c2963f4602f88

1 files changed, 8 insertions, 2 deletions

diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index 649493f8b7..989e4644c7 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -94,7 +94,6 @@ SOURCES += \
         io/qloggingregistry.cpp
 
 win32 {
-        SOURCES += io/qsettings_win.cpp
         SOURCES += io/qfsfileengine_win.cpp
         SOURCES += io/qlockfile_win.cpp
 
@@ -102,11 +101,12 @@ win32 {
         HEADERS += io/qfilesystemwatcher_win_p.h
         SOURCES += io/qfilesystemengine_win.cpp
         SOURCES += io/qfilesystemiterator_win.cpp
-        SOURCES += io/qstandardpaths_win.cpp
 
     !winrt {
+        SOURCES += io/qsettings_win.cpp
         HEADERS += io/qwindowspipewriter_p.h
         SOURCES += io/qwindowspipewriter.cpp
+        SOURCES += io/qstandardpaths_win.cpp
 
         wince* {
             SOURCES += io/qprocess_wince.cpp
@@ -119,6 +119,8 @@ win32 {
                 io/qwinoverlappedionotifier.cpp \
                 io/qwindowspipereader.cpp
         }
+    } else {
+        SOURCES += io/qstandardpaths_winrt.cpp
     }
 } else:unix|integrity {
         SOURCES += \
@@ -133,6 +135,10 @@ win32 {
             OBJECTIVE_SOURCES += io/qurl_mac.mm
         }
         mac {
+            osx {
+                OBJECTIVE_SOURCES += io/qfilesystemwatcher_fsevents.mm
+                HEADERS += io/qfilesystemwatcher_fsevents_p.h
+            }
             macx {
                 SOURCES += io/qstandardpaths_mac.cpp
             } else:ios {