Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/io/qsettings.cpp
	src/corelib/itemmodels/qstringlistmodel.cpp
	tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp

Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03

2 files changed, 26 insertions, 20 deletions

diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc
index 9f8c1b2930..1a5273455c 100644
--- a/qmake/doc/src/qmake-manual.qdoc
+++ b/qmake/doc/src/qmake-manual.qdoc
@@ -657,7 +657,7 @@
     qmake knows about many of these features, which can be accessed via specific
     variables that only take effect on the platforms where they are relevant.
 
-    \section1 OS X and iOS
+    \section1 \macos and iOS
 
     Features specific to these platforms include support for creating universal
     binaries, frameworks and bundles.
@@ -681,7 +681,7 @@
 
     qmake is able to automatically generate build
     rules for linking against frameworks in the standard framework directory on
-    OS X, located at \c{/Library/Frameworks/}.
+    \macos, located at \c{/Library/Frameworks/}.
 
     Directories other than the standard framework directory need to be specified
     to the build system, and this is achieved by appending linker options to the
@@ -722,13 +722,13 @@
     and \l{QMAKE_FRAMEWORK_VERSION} variables. By default, the values used for
     these variables are obtained from the \l{TARGET} and \l{VERSION} variables.
 
-    See \l{Qt for OS X - Deployment} for more information about
+    See \l{Qt for macOS - Deployment} for more information about
     deploying applications and libraries.
 
     \section2 Creating and Moving Xcode Projects
 
-    Developers on OS X can take advantage of the qmake support for Xcode
-    project files, as described in \l{Qt for OS X#Additional Command-Line Options}{Qt for OS X} documentation.
+    Developers on \macos can take advantage of the qmake support for Xcode
+    project files, as described in \l{Qt for macOS#Additional Command-Line Options}{Qt for \macos} documentation.
     by running qmake to generate an Xcode project from an existing qmake project
     file. For example:
 
@@ -1069,7 +1069,7 @@
     See \l{Platform Notes#Visual Studio Manifest Files}{Platform Notes}
     for more information about the options for embedding manifest files.
 
-    The following options take an effect only on OS X:
+    The following options take an effect only on \macos:
 
     \table
     \header \li Option \li Description
@@ -1439,7 +1439,7 @@
     \target QMAKE_BUNDLE_DATA
     \section1 QMAKE_BUNDLE_DATA
 
-    \note This variable is used on OS X and iOS only.
+    \note This variable is used on \macos and iOS only.
 
     Specifies the data that will be installed with a library
     bundle, and is often used to specify a collection of header files.
@@ -1461,7 +1461,7 @@
 
     \section1 QMAKE_BUNDLE_EXTENSION
 
-    \note This variable is used on OS X and iOS only.
+    \note This variable is used on \macos and iOS only.
 
     Specifies the extension to be used for library bundles.
     This allows frameworks to be created with custom extensions instead of the
@@ -1695,7 +1695,7 @@
 
     \section1 QMAKE_FRAMEWORK_BUNDLE_NAME
 
-    \note This variable is used on OS X and iOS only.
+    \note This variable is used on \macos and iOS only.
 
     In a framework project, this variable contains the name to be used for the
     framework that is built.
@@ -1709,9 +1709,9 @@
     \target QMAKE_FRAMEWORK_VERSION
     \section1 QMAKE_FRAMEWORK_VERSION
 
-    \note This variable is used on OS X and iOS only.
+    \note This variable is used on \macos and iOS only.
 
-    For projects where the build target is an OS X or iOS framework, this variable
+    For projects where the build target is a \macos or an iOS framework, this variable
     is used to specify the version number that will be applied to the framework
     that is built.
 
@@ -1804,10 +1804,10 @@
     \target QMAKE_INFO_PLIST
     \section1 QMAKE_INFO_PLIST
 
-    \note This variable is used on OS X and iOS platforms only.
+    \note This variable is used on \macos and iOS platforms only.
 
     Specifies the name of the property list file, \c{.plist}, you
-    would like to include in your OS X and iOS application bundle.
+    would like to include in your \macos and iOS application bundle.
 
     In the \c{.plist} file, you can define some variables, e.g., @EXECUTABLE@,
     which qmake will replace with the actual executable name. Other variables
@@ -2077,16 +2077,16 @@
 
     \section1 QMAKE_MAC_SDK
 
-    This variable is used on OS X when building universal binaries.
+    This variable is used on \macos when building universal binaries.
 
     \section1 QMAKE_MACOSX_DEPLOYMENT_TARGET
 
-    This variable only takes effect when building on OS X. On that
+    This variable only takes effect when building on \macos. On that
     platform, the variable will be forwarded to the MACOSX_DEPLOYMENT_TARGET
     environment variable, which is interpreted by the compiler or linker.
     For more information, see the
-    \l{Qt for OS X - Deployment#OS X Version Dependencies}{Deploying
-    an Application on OS X} document.
+    \l{Qt for macOS - Deployment#macOS Version Dependencies}{Deploying
+    an Application on \macos} document.
 
     \section1 QMAKE_MAKEFILE
 
@@ -4308,7 +4308,7 @@
         \li nmake
         \li Visual Studio projects (VS 2008 and later)
         \endlist
-    \li OS X and iOS
+    \li \macos and iOS
         \list
         \li Makefile
         \li Xcode
@@ -4679,7 +4679,7 @@
     them uses project-specific variables to customize output files.
 
     Platform-specific variables are not described here. For more information,
-    see  \l{Qt for Windows - Deployment} and \l{Qt for OS X}.
+    see  \l{Qt for Windows - Deployment} and \l{Qt for macOS}.
 
     \target Application
     \section1 Building an Application
@@ -4827,7 +4827,7 @@
     \endlist
 
     The target file name for the library is platform-dependent. For example, on
-    X11, OS X, and iOS, the library name will be prefixed by \c lib. On Windows,
+    X11, \macos, and iOS, the library name will be prefixed by \c lib. On Windows,
     no prefix is added to the file name.
 
     \target Plugin
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 1e1a7ff227..00d5d248ed 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -423,6 +423,12 @@ void NmakeMakefileGenerator::init()
         if (!defines.contains("NDEBUG"))
             defines.append("NDEBUG");
     }
+
+    if (project->values("QMAKE_APP_FLAG").isEmpty() && project->isActiveConfig("dll")) {
+        ProStringList &defines = project->values("DEFINES");
+        if (!defines.contains("_WINDLL"))
+            defines.append("_WINDLL");
+    }
 }
 
 QStringList NmakeMakefileGenerator::sourceFilesForImplicitRulesFilter()