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

Conflicts:
	doc/global/template/style/online.css
	mkspecs/android-g++/qmake.conf

Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61

4 files changed, 83 insertions, 1 deletions

diff --git a/qmake/doc/qmake.qdocconf b/qmake/doc/qmake.qdocconf
index bfdf1d1798..1a23237999 100644
--- a/qmake/doc/qmake.qdocconf
+++ b/qmake/doc/qmake.qdocconf
@@ -73,3 +73,5 @@ depends += \
     qtx11extras \
     qtxml \
     qtxmlpatterns
+
+navigation.landingpage = "qmake Manual"
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc
index cdac770c9d..ed76e9cc61 100644
--- a/qmake/doc/src/qmake-manual.qdoc
+++ b/qmake/doc/src/qmake-manual.qdoc
@@ -1195,6 +1195,12 @@
     Please see \l{Setting the Application Icon}{the application icon documentation}
     for more information.
 
+    \target IDLSOURCES
+    \section1 IDLSOURCES
+
+    This variable is used only on Windows for the Visual Studio project generation to
+    put the specified files in the Generated Files folder.
+
     \target INCLUDEPATH
     \section1 INCLUDEPATH
 
@@ -1304,6 +1310,12 @@
     handled internally by qmake and rarely needs to
     be modified.
 
+    \target MSVCPROJ_*
+    \section1 MSVCPROJ_*
+
+    These variables are handled internally by qmake and should not be modified
+    or utilized.
+
     \target MOC_DIR
     \section1 MOC_DIR
 
@@ -2110,6 +2122,38 @@
     variable is typically handled by qmake or
     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
+    \target QMAKE_TARGET_COMPANY
+    \section1 QMAKE_TARGET_COMPANY
+
+    Windows only. Specifies the company for the project target, this is used where
+    applicable for putting the company name in the application's properties. This is
+    only utilized if the VERSION or RC_ICONS variable is set and the RC_FILE and RES_FILE
+    variables are not set.
+
+    \target QMAKE_TARGET_DESCRIPTION
+    \section1 QMAKE_TARGET_DESCRIPTION
+
+    Windows only. Specifies the description for the project target, this is used where
+    applicable for putting the description in the application's properties. This is only
+    utilized if the VERSION or RC_ICONS variable is set and the RC_FILE and RES_FILE variables
+    are not set.
+
+    \target QMAKE_TARGET_COPYRIGHT
+    \section1 QMAKE_TARGET_COPYRIGHT
+
+    Windows only. Specifies the copyright information for the project target, this is used where
+    applicable for putting the copyright information in the application's properties. This is only
+    utilized if the VERSION or RC_ICONS variable is set and the RC_FILE and RES_FILE variables
+    are not set.
+
+    \target QMAKE_TARGET_PRODUCT
+    \section1 QMAKE_TARGET_PRODUCT
+
+    Windows only. Specifies the product for the project target, this is used where
+    applicable for putting the product in the application's properties. This is only utilized if
+    the VERSION or RC_ICONS variable is set and the RC_FILE and RES_FILE variables
+    are not set.
+
     \section1 QT
 
     Specifies the Qt modules that are used by your project.
@@ -2209,6 +2253,26 @@
     qmake or \l{#QMAKESPEC}{qmake.conf} and rarely
     needs to be modified.
 
+    \target RC_CODEPAGE
+    \section1 RC_CODEPAGE
+
+    Windows only. Specifies the codepage that should be specified in a generated rc file. This is
+    only utilized if the VERSION or RC_ICONS variable is set and the RC_FILE and RES_FILE variables
+    are not set.
+
+    \target RC_ICONS
+    \section1 RC_ICONS
+
+    Windows only. Specifies the icons that should be included into a generated rc file, this
+    is only utilized if the RC_FILE and RES_FILE variable are not set.
+
+    \target RC_LANG
+    \section1 RC_LANG
+
+    Windows only. Specifies the language that should be specified in a generated rc file. This is
+    only utilized if the VERSION or RC_ICONS variable is set and the RC_FILE and RES_FILE variables
+    are not set.
+
     \section1 RC_INCLUDEPATH
 
     Specifies include paths that are passed to the Windows Resource Compiler.
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index bf9a9d8343..4c501983d8 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -444,6 +444,22 @@ MakefileGenerator::init()
 
     setSystemIncludes(v["QMAKE_DEFAULT_INCDIRS"]);
 
+    const char * const cacheKeys[] = { "_QMAKE_STASH_", "_QMAKE_SUPER_CACHE_", 0 };
+    for (int i = 0; cacheKeys[i]; ++i) {
+        if (v[cacheKeys[i]].isEmpty())
+            continue;
+        const ProString &file = v[cacheKeys[i]].first();
+        if (file.isEmpty())
+            continue;
+
+        QFileInfo fi(fileInfo(file.toQString()));
+
+        // If the file lives in the output dir we treat it as 'owned' by
+        // the current project, so it should be distcleaned by it as well.
+        if (fi.path() == Option::output_dir)
+            v["QMAKE_DISTCLEAN"].append(fi.fileName());
+    }
+
     ProStringList &quc = v["QMAKE_EXTRA_COMPILERS"];
 
     //make sure the COMPILERS are in the correct input/output chain order
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 9385a50e02..f271eb0679 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1177,7 +1177,7 @@ void VcprojGenerator::initResourceTool()
     // to add it for the compiler) However, the resource tool does not do this.
     if(project->isActiveConfig("debug"))
         conf.resource.PreprocessorDefinitions += "_DEBUG";
-    if(project->isActiveConfig("staticlib"))
+    if (conf.CompilerVersion < NET2010 && project->isActiveConfig("staticlib"))
         conf.resource.ResourceOutputFileName = "$(OutDir)\\$(InputName).res";
 }