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

Conflicts:
	src/corelib/global/qglobal.h
	src/platformsupport/platformcompositor/qopenglcompositor.cpp
	src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I5422868500be695584a496dbbbc719d146bc572d

doc/global/externalsites/qt-webpages.qdoc

@@ -29,7 +29,7 @@
     \title Qt Homepage
 */
 /*!
-    \externalpage http://bugreports.qt-project.org
+    \externalpage http://bugreports.qt.io
     \title Qt Bug Tracker
 */
 /*!

doc/global/html-header-online.qdocconf

@@ -117,7 +117,7 @@ HTML.postheader = \
     "        <li><a href=\"http://qt-project.org/wiki\">Wiki</a></li>\n" \
     "        <li><a href=\"http://doc.qt.io/\" class=\"active\">Documentation</a></li>\n" \
     "        <li><a href=\"http://qt-project.org/forums\">Forum</a></li>\n" \
-    "        <li><a href=\"https://bugreports.qt-project.org/\">Bug Reports</a></li>\n" \
+    "        <li><a href=\"https://bugreports.qt.io/\">Bug Reports</a></li>\n" \
     "        <li><a href=\"https://codereview.qt-project.org/\">Code Review</a></li>\n" \
     "    </ul>\n" \
     "    <div id=\"main_title_bar\">\n" \

examples/webkit/webkit-guide/_index.html

@@ -298,7 +298,7 @@ <h2>5. Storage</h2>
       <div id="feedcloseX" class="feedclose t_button">X</div>
     <form id="feedform" action="http://doc.qt.nokia.com/docFeedbck/feedback.php" method="get">
       <p id="noteHead">Thank you for giving your feedback.</p> <p class="note">Make sure it is related to this specific page. For more general bugs and
-      requests, please use the <a href="http://bugreports.qt-project.org/secure/Dashboard.jspa">Qt Bug Tracker</a>.</p>
+      requests, please use the <a href="http://bugreports.qt.io/secure/Dashboard.jspa">Qt Bug Tracker</a>.</p>
       <p><textarea id="feedbox" name="feedText" rows="5" cols="40"></textarea></p>
       <p><input id="feedsubmit" class="feedclose" type="submit" name="feedback" /></p>
     </form>

qmake/doc/src/qmake-manual.qdoc

@@ -1019,7 +1019,7 @@
          on the directory they reside. This is turned on by default.
     \row \li embed_manifest_dll \li Embeds a manifest file in the DLL created
          as part of a library project.
-    \row \li embed_manifest_exe \li Embeds a manifest file in the DLL created
+    \row \li embed_manifest_exe \li Embeds a manifest file in the EXE created
          as part of an application project.
     \endtable
 

src/3rdparty/angle/src/common/utilities.cpp

@@ -486,7 +486,7 @@ void writeFile(const char* path, const void* content, size_t size)
 }
 #endif // !ANGLE_ENABLE_WINDOWS_STORE
 
-#if defined(ANGLE_ENABLE_WINDOWS_STORE)
+#if defined(ANGLE_ENABLE_WINDOWS_STORE) && _MSC_FULL_VER < 180031101
 
 void Sleep(unsigned long dwMilliseconds)
 {

src/3rdparty/angle/src/common/utilities.h

@@ -51,7 +51,7 @@ std::string getTempPath();
 void writeFile(const char* path, const void* data, size_t size);
 #endif
 
-#if defined(ANGLE_ENABLE_WINDOWS_STORE)
+#if defined(ANGLE_ENABLE_WINDOWS_STORE) && _MSC_FULL_VER < 180031101
 void Sleep(_In_ unsigned long dwMilliseconds);
 #endif
 

src/3rdparty/angle/src/libGLESv2/Shader.cpp

@@ -53,7 +53,7 @@ void Shader::setSource(GLsizei count, const char *const *string, const GLint *le
     {
         if (length == nullptr || length[i] < 0)
         {
-            stream.write(string[i], std::strlen(string[i]));
+            stream.write(string[i], strlen(string[i]));
         }
         else
         {

src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java

@@ -292,7 +292,7 @@ else if (m_softInputMode == 0)
                 }
             } else if ((inputHints & ImhHiddenText) != 0) {
                 inputType |= android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD;
-            } else if ((inputHints & ImhSensitiveData) != 0) {
+            } else if ((inputHints & ImhSensitiveData) != 0 || (inputHints & ImhNoPredictiveText) != 0) {
                 inputType |= android.text.InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;
             }
 

src/android/templates/build.gradle

@@ -1,14 +1,20 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.1'
+        classpath 'com.android.tools.build:gradle:1.0.0'
     }
 }
 
-apply plugin: 'android'
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+apply plugin: 'com.android.application'
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])

src/angle/patches/0020-ANGLE-Do-not-use-std-strlen.patch

@@ -0,0 +1,30 @@
+From 071b8936386b0b44475c91511d85479e5c633bc5 Mon Sep 17 00:00:00 2001
+From: Kai Koehne <[email protected]>
+Date: Thu, 11 Dec 2014 13:54:23 +0100
+Subject: [PATCH] ANGLE: Do not use std::strlen
+
+This is a cherry-pick from upstream change
+
+e7cfb3dd2029c1bfe5c175ad994c03cac221ad4d
+
+Change-Id: Iefe01545319f9ad268c0c6bf8e8b2181e09d8a84
+---
+ src/3rdparty/angle/src/libGLESv2/Shader.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/angle/src/libGLESv2/Shader.cpp b/src/3rdparty/angle/src/libGLESv2/Shader.cpp
+index 5bca746..024ef8f 100644
+--- a/src/3rdparty/angle/src/libGLESv2/Shader.cpp
++++ b/src/3rdparty/angle/src/libGLESv2/Shader.cpp
+@@ -53,7 +53,7 @@ void Shader::setSource(GLsizei count, const char *const *string, const GLint *le
+     {
+         if (length == nullptr || length[i] < 0)
+         {
+-            stream.write(string[i], std::strlen(string[i]));
++            stream.write(string[i], strlen(string[i]));
+         }
+         else
+         {
+-- 
+1.9.4.msysgit.0
+

src/angle/patches/0020-ANGLE-Fix-compilation-with-MSVC2013-Update4.patch

@@ -0,0 +1,43 @@
+From a48dfb3f1ecb57a59084c0e87155506586b73188 Mon Sep 17 00:00:00 2001
+From: Maurice Kalinowski <[email protected]>
+Date: Thu, 11 Dec 2014 13:11:55 +0100
+Subject: [PATCH] [ANGLE] Fix compilation with MSVC2013 Update4
+
+Update4 provides a native Sleep implementation. Hence the wrapper
+needs to be disabled.
+
+Change-Id: I162da45934b02c262ac09b557c66c3363c276e54
+---
+ src/3rdparty/angle/src/common/utilities.cpp | 2 +-
+ src/3rdparty/angle/src/common/utilities.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/3rdparty/angle/src/common/utilities.cpp b/src/3rdparty/angle/src/common/utilities.cpp
+index 9d797a6..924573e 100644
+--- a/src/3rdparty/angle/src/common/utilities.cpp
++++ b/src/3rdparty/angle/src/common/utilities.cpp
+@@ -486,7 +486,7 @@ void writeFile(const char* path, const void* content, size_t size)
+ }
+ #endif // !ANGLE_ENABLE_WINDOWS_STORE
+
+-#if defined(ANGLE_ENABLE_WINDOWS_STORE)
++#if defined(ANGLE_ENABLE_WINDOWS_STORE) && _MSC_FULL_VER < 180031101
+
+ void Sleep(unsigned long dwMilliseconds)
+ {
+diff --git a/src/3rdparty/angle/src/common/utilities.h b/src/3rdparty/angle/src/common/utilities.h
+index 2cf6bed..7583d3e 100644
+--- a/src/3rdparty/angle/src/common/utilities.h
++++ b/src/3rdparty/angle/src/common/utilities.h
+@@ -51,7 +51,7 @@ std::string getTempPath();
+ void writeFile(const char* path, const void* data, size_t size);
+ #endif
+
+-#if defined(ANGLE_ENABLE_WINDOWS_STORE)
++#if defined(ANGLE_ENABLE_WINDOWS_STORE) && _MSC_FULL_VER < 180031101
+ void Sleep(_In_ unsigned long dwMilliseconds);
+ #endif
+
+-- 
+1.9.4.msysgit.2
+

src/corelib/doc/src/objectmodel/properties.qdoc

@@ -97,7 +97,10 @@
     of the property changes.
     \c NOTIFY signals for \c MEMBER variables must take zero or one parameter,
     which must be of the same type as the property. The parameter will take the
-    new value of the property.
+    new value of the property. The \c NOTIFY signal should only be emitted when
+    the property has really been changed, to avoid bindings being unnecessarily
+    re-evaluated in QML, for example. Qt emits automatically that signal when
+    needed for MEMBER properties that do not have an explicit setter.
 
     \li A \c REVISION number is optional. If included, it defines
     the property and its notifier signal to be used in a particular

src/corelib/global/qcompilerdetection.h

@@ -154,17 +154,17 @@
 /* Clang also masquerades as GCC */
 #    if defined(__apple_build_version__)
 #      /* http://en.wikipedia.org/wiki/Xcode#Toolchain_Versions */
-#      if __apple_build_version__ >= 600051
+#      if __apple_build_version__ >= 6000051
 #        define Q_CC_CLANG 305
-#      elif __apple_build_version__ >= 503038
+#      elif __apple_build_version__ >= 5030038
 #        define Q_CC_CLANG 304
-#      elif __apple_build_version__ >= 500275
+#      elif __apple_build_version__ >= 5000275
 #        define Q_CC_CLANG 303
-#      elif __apple_build_version__ >= 425024
+#      elif __apple_build_version__ >= 4250024
 #        define Q_CC_CLANG 302
-#      elif __apple_build_version__ >= 318045
+#      elif __apple_build_version__ >= 3180045
 #        define Q_CC_CLANG 301
-#      elif __apple_build_version__ >= 211101
+#      elif __apple_build_version__ >= 2111001
 #        define Q_CC_CLANG 300
 #      else
 #        error "Unknown Apple Clang version"

src/corelib/global/qlogging.cpp

@@ -1286,8 +1286,8 @@ static void android_default_message_handler(QtMsgType type,
     case QtFatalMsg: priority = ANDROID_LOG_FATAL; break;
     };
 
-    __android_log_print(priority, "Qt", "%s:%d (%s): %s\n",
-                        context.file, context.line,
+    __android_log_print(priority, qPrintable(QCoreApplication::applicationName()),
+                        "%s:%d (%s): %s\n", context.file, context.line,
                         context.function, qPrintable(message));
 }
 #endif //Q_OS_ANDROID

src/corelib/global/qnamespace.qdoc

@@ -2612,7 +2612,7 @@
     \value ElideNone    Ellipsis should NOT appear in the text.
 
     Qt::ElideMiddle is normally the most appropriate choice for URLs (e.g.,
-    "\l{http://bugreports.qt-project.org/browse/QTWEBSITE-13}{http://bugreports.qt.../QTWEBSITE-13/}"),
+    "\l{http://bugreports.qt.io/browse/QTWEBSITE-13}{http://bugreports.qt.../QTWEBSITE-13/}"),
     whereas Qt::ElideRight is appropriate
     for other strings (e.g.,
     "\l{http://doc.qt.digia.com/qq/qq09-mac-deployment.html}{Deploying Applications on Ma...}").

src/corelib/tools/qcommandlineparser.cpp

@@ -331,11 +331,13 @@ bool QCommandLineParser::addOption(const QCommandLineOption &option)
 /*!
     \since 5.4
 
-    Adds the options \a options to look for while parsing.
+    Adds the options to look for while parsing. The options are specified by
+    the parameter \a options.
 
-    Returns \c false if adding any of the options failed; otherwise returns \c false.
+    Returns \c true if adding all of the options was successful; otherwise
+    returns \c false.
 
-    Cf. addOption() for when it may fail.
+    See the documentation for addOption() for when this function may fail.
 */
 bool QCommandLineParser::addOptions(const QList<QCommandLineOption> &options)
 {

src/corelib/tools/qlocale_mac.mm

@@ -502,7 +502,7 @@ static QVariant macQuoteString(QSystemLocale::QueryType type, const QStringRef &
         } else if (typeId == CFStringGetTypeID()) {
             result = QStringList(QCFString::toQString(languages.as<CFStringRef>()));
         } else {
-            qWarning("QLocale::uiLanguages(): CFPreferencesCopyValue returned unhandled type \"%s\"; please report to http://bugreports.qt-project.org",
+            qWarning("QLocale::uiLanguages(): CFPreferencesCopyValue returned unhandled type \"%s\"; please report to http://bugreports.qt.io",
                      qPrintable(QCFString::toQString(CFCopyTypeIDDescription(typeId))));
         }
         return QVariant(result);

src/gui/image/qimage.cpp

@@ -4511,7 +4511,6 @@ QImage QImage::transformed(const QTransform &matrix, Qt::TransformationMode mode
 
     dImage.d->dpmx = dotsPerMeterX();
     dImage.d->dpmy = dotsPerMeterY();
-    dImage.d->devicePixelRatio = devicePixelRatio();
 
     // initizialize the data
     if (d->format == QImage::Format_Indexed8) {
@@ -4526,13 +4525,19 @@ QImage QImage::transformed(const QTransform &matrix, Qt::TransformationMode mode
         memset(dImage.bits(), 0x00, dImage.byteCount());
 
     if (target_format >= QImage::Format_RGB32) {
+        // Prevent QPainter from applying devicePixelRatio corrections
+        const QImage sImage = (devicePixelRatio() != 1) ? QImage(constBits(), width(), height(), format()) : *this;
+
+        Q_ASSERT(sImage.devicePixelRatio() == 1);
+        Q_ASSERT(sImage.devicePixelRatio() == dImage.devicePixelRatio());
+
         QPainter p(&dImage);
         if (mode == Qt::SmoothTransformation) {
             p.setRenderHint(QPainter::Antialiasing);
             p.setRenderHint(QPainter::SmoothPixmapTransform);
         }
         p.setTransform(mat);
-        p.drawImage(QPoint(0, 0), *this);
+        p.drawImage(QPoint(0, 0), sImage);
     } else {
         bool invertible;
         mat = mat.inverted(&invertible);                // invert matrix
@@ -4544,6 +4549,8 @@ QImage QImage::transformed(const QTransform &matrix, Qt::TransformationMode mode
         int dbpl = dImage.bytesPerLine();
         qt_xForm_helper(mat, 0, type, bpp, dImage.bits(), dbpl, 0, hd, sptr, sbpl, ws, hs);
     }
+
+    dImage.d->devicePixelRatio = devicePixelRatio();
     return dImage;
 }
 

src/gui/kernel/qopenglcontext.cpp

@@ -1114,9 +1114,9 @@ void QOpenGLContext::deleteQGLContext()
 void *QOpenGLContext::openGLModuleHandle()
 {
 #ifdef QT_OPENGL_DYNAMIC
-    QGuiApplication *app = qGuiApp;
-    Q_ASSERT(app);
-    return app->platformNativeInterface()->nativeResourceForIntegration(QByteArrayLiteral("glhandle"));
+    QPlatformNativeInterface *ni = QGuiApplication::platformNativeInterface();
+    Q_ASSERT(ni);
+    return ni->nativeResourceForIntegration(QByteArrayLiteral("glhandle"));
 #else
     return 0;
 #endif