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

Conflicts:
	examples/examples.pro
	qmake/library/qmakebuiltins.cpp
	src/corelib/global/qglobal.cpp
		Re-apply b525ec2 to qrandom.cpp(code movement in 030782e)
	src/corelib/global/qnamespace.qdoc
	src/corelib/global/qrandom.cpp
	src/gui/kernel/qwindow.cpp
		Re-apply a3d59c7 to QWindowPrivate::setVisible() (code movement in d7a9e08)
	src/network/ssl/qsslkey_openssl.cpp
	src/plugins/platforms/android/androidjniinput.cpp
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/widgets/widgets/qmenu.cpp
	tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp

Change-Id: If7ab427804408877a93cbe02079fca58e568bfd3

3 files changed, 37 insertions, 8 deletions

diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index ab699157ca..63926e7ef0 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -1902,7 +1902,7 @@ int
 ProjectBuilderMakefileGenerator::pbuilderVersion() const
 {
     if (!project->isEmpty("QMAKE_PBUILDER_VERSION"))
-        return project->first("QMAKE_PBUILDER_VERSION").toQString().toInt();
+        return project->first("QMAKE_PBUILDER_VERSION").toInt();
     return 46; // Xcode 3.2-compatible; default format since that version
 }
 
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp
index 3140b045a1..c68eeb13d6 100644
--- a/qmake/generators/makefiledeps.cpp
+++ b/qmake/generators/makefiledeps.cpp
@@ -422,25 +422,53 @@ static bool matchWhileUnsplitting(const char *buffer, int buffer_len, int start,
 /* Advance from an opening quote at buffer[offset] to the matching close quote. */
 static int scanPastString(char *buffer, int buffer_len, int offset, int *lines)
 {
+    // http://en.cppreference.com/w/cpp/language/string_literal
     // It might be a C++11 raw string.
     bool israw = false;
     if (buffer[offset] == '"' && offset > 0) {
         int explore = offset - 1;
-        while (explore > 0 && buffer[explore] != 'R') {
-            if (buffer[explore] == '8' || buffer[explore] == 'u' || buffer[explore] == 'U') {
-                explore--;
-            } else if (explore > 1 && qmake_endOfLine(buffer[explore])
-                       && buffer[explore - 1] == '\\') {
+        bool prefix = false; // One of L, U, u or u8 may appear before R
+        bool saw8 = false; // Partial scan of u8
+        while (explore >= 0) {
+            // Cope with backslash-newline interruptions of the prefix:
+            if (explore > 0
+                && qmake_endOfLine(buffer[explore])
+                && buffer[explore - 1] == '\\') {
                 explore -= 2;
-            } else if (explore > 2 && buffer[explore] == '\n'
+            } else if (explore > 1
+                       && buffer[explore] == '\n'
                        && buffer[explore - 1] == '\r'
                        && buffer[explore - 2] == '\\') {
                 explore -= 3;
+                // Remaining cases can only decrement explore by one at a time:
+            } else if (saw8 && buffer[explore] == 'u') {
+                explore--;
+                saw8 = false;
+                prefix = true;
+            } else if (saw8 || prefix) {
+                break;
+            } else if (explore > 1 && buffer[explore] == '8') {
+                explore--;
+                saw8 = true;
+            } else if (buffer[explore] == 'L'
+                       || buffer[explore] == 'U'
+                       || buffer[explore] == 'u') {
+                explore--;
+                prefix = true;
+            } else if (buffer[explore] == 'R') {
+                if (israw)
+                    break;
+                explore--;
+                israw = true;
             } else {
                 break;
             }
         }
-        israw = (buffer[explore] == 'R');
+        // Check the R (with possible prefix) isn't just part of an identifier:
+        if (israw && explore >= 0
+            && (isalnum(buffer[explore]) || buffer[explore] == '_')) {
+            israw = false;
+        }
     }
 
     if (israw) {
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index a22e4bf48f..b4c2579c5c 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -634,6 +634,7 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t)
                 if (generateManifest) {
                     manifest = escapeFilePath(manifest);
                     QString manifest_bak = escapeFilePath(target +  "_manifest.bak");
+                    project->values("QMAKE_CLEAN") << manifest_bak;
                     t << "\n\tif not exist $(DESTDIR_TARGET) if exist " << manifest
                       << " del " << manifest;
                     t << "\n\tif exist " << manifest << " copy /Y " << manifest << ' ' << manifest_bak;