Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

2 files changed, 18 insertions, 10 deletions

diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 9cb63ce539..2a99b5dd34 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -221,7 +221,11 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
         do_incremental = false;
     t << "DIST          = " << valList(fileFixify(project->values("DISTFILES").toQStringList())) << endl;
     t << "QMAKE_TARGET  = " << var("QMAKE_ORIG_TARGET") << endl;
-    t << "DESTDIR       = " << var("DESTDIR") << endl;
+    // The comment is important for mingw32-make.exe on Windows as otherwise trailing slashes
+    // would be interpreted as line continuation. The lack of spacing between the value and the
+    // comment is also important as otherwise quoted use of "$(DESTDIR)" would include this
+    // spacing.
+    t << "DESTDIR       = " << var("DESTDIR") << "#avoid trailing-slash linebreak" << endl;
     if(project->isActiveConfig("compile_libtool"))
         t << "TARGETL       = " << var("TARGET_la") << endl;
     t << "TARGET        = " << escapeFilePath(var("TARGET")) << endl;
@@ -546,7 +550,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
               << var("QMAKE_LINK_SHLIB_CMD");
             if(!destdir.isEmpty())
                 t << "\n\t"
-                  << "-$(MOVE) $(TARGET) " << destdir;
+                  << "-$(MOVE) $(TARGET) " << destdir << " ";
             if(!project->isEmpty("QMAKE_POST_LINK"))
                 t << "\n\t" << var("QMAKE_POST_LINK");
             t << endl << endl;
@@ -579,10 +583,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                   << "-$(DEL_FILE) " << destdir << "$(TARGET0)\n\t"
                   << "-$(DEL_FILE) " << destdir << "$(TARGET1)\n\t"
                   << "-$(DEL_FILE) " << destdir << "$(TARGET2)\n\t"
-                  << "-$(MOVE) $(TARGET)  " << destdir << "\n\t"
-                  << "-$(MOVE) $(TARGET0) " << destdir << "\n\t"
-                  << "-$(MOVE) $(TARGET1) " << destdir << "\n\t"
-                  << "-$(MOVE) $(TARGET2) " << destdir << "\n\t";
+                  << "-$(MOVE) $(TARGET)  " << destdir << " \n\t"
+                  << "-$(MOVE) $(TARGET0) " << destdir << " \n\t"
+                  << "-$(MOVE) $(TARGET1) " << destdir << " \n\t"
+                  << "-$(MOVE) $(TARGET2) " << destdir << " \n\t";
             if(!project->isEmpty("QMAKE_POST_LINK"))
                 t << "\n\t" << var("QMAKE_POST_LINK");
             t << endl << endl;
@@ -595,8 +599,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                 t  << "\n\t"
                    << "-$(DEL_FILE) " << destdir << "$(TARGET)\n\t"
                    << "-$(DEL_FILE) " << destdir << "$(TARGET0)\n\t"
-                   << "-$(MOVE) $(TARGET)  " << destdir << "\n\t"
-                   << "-$(MOVE) $(TARGET0) " << destdir << "\n\t";
+                   << "-$(MOVE) $(TARGET)  " << destdir << " \n\t"
+                   << "-$(MOVE) $(TARGET0) " << destdir << " \n\t";
             if(!project->isEmpty("QMAKE_POST_LINK"))
                 t << "\n\t" << var("QMAKE_POST_LINK");
             t << endl << endl;
@@ -635,7 +639,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                 t << "\t" << "$(RANLIB) $(TARGET)" << "\n";
             if(!destdir.isEmpty())
                 t << "\t" << "-$(DEL_FILE) " << destdir << "$(TARGET)" << "\n"
-                  << "\t" << "-$(MOVE) $(TARGET) " << destdir << "\n";
+                  << "\t" << "-$(MOVE) $(TARGET) " << destdir << " \n";
         } else {
             int max_files = project->first("QMAKE_MAX_FILES_PER_AR").toInt();
             ProStringList objs = project->values("OBJECTS") + project->values("OBJCOMP"),
@@ -666,7 +670,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                     t << "\t" << "$(RANLIB) " << (*libit) << "\n";
                 if(!destdir.isEmpty())
                     t << "\t" << "-$(DEL_FILE) " << destdir << (*libit) << "\n"
-                      << "\t" << "-$(MOVE) " << (*libit) << " " << destdir << "\n";
+                      << "\t" << "-$(MOVE) " << (*libit) << " " << destdir << " \n";
             }
         }
         t << endl << endl;
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 2a9e657304..6fdd2f4bd2 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -87,6 +87,7 @@ const char _CompileOnly[]                       = "CompileOnly";
 const char _ConfigurationType[]                 = "ConfigurationType";
 const char _Culture[]                           = "Culture";
 const char _DLLDataFileName[]                   = "DLLDataFileName";
+const char _DataExecutionPrevention[]           = "DataExecutionPrevention";
 const char _DebugInformationFormat[]            = "DebugInformationFormat";
 const char _DefaultCharIsUnsigned[]             = "DefaultCharIsUnsigned";
 const char _DefaultCharType[]                   = "DefaultCharType";
@@ -179,6 +180,7 @@ const char _ProgramDatabase[]                   = "ProgramDatabase";
 const char _ProgramDataBaseFileName[]           = "ProgramDataBaseFileName";
 const char _ProgramDatabaseFile[]               = "ProgramDatabaseFile";
 const char _ProxyFileName[]                     = "ProxyFileName";
+const char _RandomizedBaseAddress[]             = "RandomizedBaseAddress";
 const char _RedirectOutputAndErrors[]           = "RedirectOutputAndErrors";
 const char _RegisterOutput[]                    = "RegisterOutput";
 const char _RelativePath[]                      = "RelativePath";
@@ -2560,6 +2562,7 @@ void VCProjectWriter::write(XmlOutput &xml, const VCLinkerTool &tool)
         << attrX(_AdditionalOptions, tool.AdditionalOptions, " ")
         << attrX(_AddModuleNamesToAssembly, tool.AddModuleNamesToAssembly)
         << attrS(_BaseAddress, tool.BaseAddress)
+        << attrT(_DataExecutionPrevention, tool.DataExecutionPrevention)
         << attrX(_DelayLoadDLLs, tool.DelayLoadDLLs)
         << attrE(_EnableCOMDATFolding, tool.EnableCOMDATFolding, /*ifNot*/ optFoldingDefault)
         << attrS(_EntryPointSymbol, tool.EntryPointSymbol)
@@ -2590,6 +2593,7 @@ void VCProjectWriter::write(XmlOutput &xml, const VCLinkerTool &tool)
         << attrE(_OptimizeReferences, tool.OptimizeReferences, /*ifNot*/ optReferencesDefault)
         << attrS(_OutputFile, tool.OutputFile)
         << attr(_ProgramDatabaseFile, tool.ProgramDatabaseFile)
+        << attrT(_RandomizedBaseAddress, tool.RandomizedBaseAddress)
         << attrT(_RegisterOutput, tool.RegisterOutput)
         << attrT(_ResourceOnlyDLL, tool.ResourceOnlyDLL)
         << attrT(_SetChecksum, tool.SetChecksum)