Merge remote-tracking branch 'origin/5.8' into 5.9

Conflicts:
	examples/network/network.pro
	mkspecs/features/mac/default_post.prf
	src/corelib/io/qfilesystemengine_win.cpp
	src/corelib/io/qprocess.cpp
	src/corelib/io/qprocess.h
	src/corelib/io/qprocess_p.h
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/thread/qmutex.cpp
	src/platformsupport/fontdatabases/windows/windows.pri
	src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
	tests/auto/corelib/io/io.pro

Change-Id: I8a27e0e141454818bba9c433200a4e84a88d147e

1 files changed, 26 insertions, 27 deletions

diff --git a/src/corelib/plugin/plugin.pri b/src/corelib/plugin/plugin.pri
index 473480eb55..a0e0d76044 100644
--- a/src/corelib/plugin/plugin.pri
+++ b/src/corelib/plugin/plugin.pri
@@ -1,38 +1,37 @@
 # Qt core library plugin module
 
 HEADERS += \
-	plugin/qfactoryinterface.h \
-	plugin/qpluginloader.h \
-	plugin/qlibrary.h \
-	plugin/qlibrary_p.h \
-	plugin/qplugin.h \
-	plugin/quuid.h \
-	plugin/qfactoryloader_p.h \
-	plugin/qsystemlibrary_p.h \
-        plugin/qelfparser_p.h \
-        plugin/qmachparser_p.h
+    plugin/qfactoryinterface.h \
+    plugin/qpluginloader.h \
+    plugin/qplugin.h \
+    plugin/quuid.h \
+    plugin/qfactoryloader_p.h
 
 SOURCES += \
-	plugin/qfactoryinterface.cpp \
-	plugin/qpluginloader.cpp \
-	plugin/qfactoryloader.cpp \
-	plugin/quuid.cpp \
-	plugin/qlibrary.cpp \
-        plugin/qelfparser_p.cpp \
-        plugin/qmachparser.cpp
+    plugin/qfactoryinterface.cpp \
+    plugin/qpluginloader.cpp \
+    plugin/qfactoryloader.cpp \
+    plugin/quuid.cpp
 
 win32 {
-	SOURCES += \
-		plugin/qlibrary_win.cpp \
-		plugin/qsystemlibrary.cpp
+    HEADERS += plugin/qsystemlibrary_p.h
+    SOURCES += plugin/qsystemlibrary.cpp
 }
 
-unix {
-	SOURCES += plugin/qlibrary_unix.cpp
-}
+qtConfig(library) {
+    HEADERS += \
+        plugin/qlibrary.h \
+        plugin/qlibrary_p.h \
+        plugin/qelfparser_p.h \
+        plugin/qmachparser_p.h
 
-integrity {
-	SOURCES += plugin/qlibrary_unix.cpp
-}
+    SOURCES += \
+        plugin/qlibrary.cpp \
+        plugin/qelfparser_p.cpp \
+        plugin/qmachparser.cpp
+
+    unix: SOURCES += plugin/qlibrary_unix.cpp
+    else: SOURCES += plugin/qlibrary_win.cpp
 
-!no-libdl: LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD
+    qtConfig(dlopen): QMAKE_USE_PRIVATE += libdl
+}