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

Conflicts:
	src/corelib/io/qiodevice.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux_p.h
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/tools/bootstrap/bootstrap.pro
	src/widgets/styles/qmacstyle_mac.mm

Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b

configure

@@ -1434,14 +1434,19 @@ while [ "$#" -gt 0 ]; do
         fi
         ;;
     feature-*)
-            FEATURE=`echo $VAR | sed 's,^[^-]*-\([^-]*\),\1,' | tr 'abcdefghijklmnopqrstuvwxyz-' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+        FEATURE=`echo $VAR | sed 's,^[^-]*-\([^-]*\),\1,' | tr 'abcdefghijklmnopqrstuvwxyz-' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+        if grep "^Feature: *${FEATURE} *\$" "$relpath"/src/corelib/global/qfeatures.txt >/dev/null 2>&1; then
             if [ "$VAL" = "no" ]; then
                 QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_$FEATURE"
             elif [ "$VAL" = "yes" ] || [ "$VAL" = "unknown" ]; then
                 QCONFIG_FLAGS="$QCONFIG_FLAGS QT_$FEATURE"
             else
                 UNKNOWN_OPT=yes
             fi
+        else
+            echo "ERROR: Unknown feature $FEATURE"
+            UNKNOWN_OPT=yes
+        fi
         ;;
     shared)
         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
@@ -3183,6 +3188,7 @@ if [ "$XPLATFORM_IOS" = "yes" ]; then
     CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS examples"
     CFG_SHARED="no" # iOS builds should be static to be able to submit to the App Store
     CFG_SKIP_MODULES="$CFG_SKIP_MODULES qtconnectivity qtdoc qtmacextras qtserialport qtwebkit qtwebkit-examples"
+    CFG_PRECOMPILE="no" # Precompiled headers not supported with multiple -arch arguments
 
     # If the user passes -sdk on the command line we build a SDK-specific Qt build.
     # Otherwise we build a joined simulator and device build, which is the default.

dist/changes-5.4.0

@@ -25,6 +25,10 @@ QtCore
  - Added QEnableSharedFromThis, a class that allows obtaining a
    QSharedPointer for an object already managed by a shared pointer.
 
+QtGui
+-----
+
+ - QImageReader now automatically rotates JPEG images according to Exif orientation
 
 QtSql
 -----
@@ -43,3 +47,46 @@ OS X
  - OS X 10.10 is now supported.
  - QMacStyle has been updated with better OS 10.10 support.
  - The Qt binary packages are now configured with C++11 enabled.
+
+Windows
+-------
+
+ - [QTBUG-38259] Changed configure defaults so that Qt5Core does not
+   link against ICU libraries anymore. Pass '-icu' to enable it.
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+configure & build system
+------------------------
+
+ - The -process/-fully-process/-dont-process configure options have been
+   removed due to being unnecessary and counterproductive.
+ - [QTBUG-36955] The -vcproj configure option was removed. Use "qmake -r -tp vc"
+   _after_ building Qt in case you want to use Visual Studio to work on Qt.
+ - [QTBUG-37961] Qt plugins contain version info again.
+ - [QTBUG-39216] Fixed more cases where the Qt build would pick up headers
+   from a pre-existing Qt installation.
+ - [QTBUG-41267] Fixed parallelized (jom) -debug-and-release builds.
+
+qmake
+-----
+
+ - [QTBUG-21910][Unix] Added 'make dist' target for SUBDIRS projects.
+ - [QTBUG-32895][iOS] Fixed structure of bundles. They can be signed now.
+ - [QTBUG-26782][VS] Fixed handling of TARGET_EXT.
+ - [QTBUG-30712][VS] Fixed handling of QMAKE_LIBFLAGS.
+ - [QTBUG-30373][VS] Using different RESOURCES in different build variants
+   no longer produces invalid vcxproj files.
+ - [QTBUG-37520][VS] Made it possible to suppress qmake warnings about
+   unknown compiler options. CONFIG+=suppress_vcproj_warnings.
+ - [QTBUG-37363][MSVC2012+] embed_manifest_exe is now properly supported.
+ - [QTBUG-41504][MSVC2012+] Building DLLs targeting Windows XP is now
+   supported. As a side effect, Windows CE makespecs must not add /ENTRY: to
+   QMAKE_LFLAGS_CONSOLE any more. The flag is hard-coded in console.prf now.
+ - [QTBUG-35318][Xcode] Fixed QMAKE_BUNDLE_DATA's path resolution.
+ - [QTBUG-39527] Fixed qtCompile() when used with jom -jN.
+ - QMAKE_EXTRA_COMPILERS' commands and depend_command are no longer mangled.
+   Use $$shell_path() and $$shell_quote() to prepare the commands correctly.
+ - Added link-time optimization support for Clang, GCC and ICC. CONFIG+=ltgc.

doc/global/externalsites/qtcreator.qdoc

@@ -483,3 +483,15 @@
     \externalpage http://qt-project.org/doc/qtcreator/creator-developing-winrt.html
     \title Qt Creator: Connecting Windows Runtime Devices
 */
+/*!
+    \externalpage http://qt-project.org/doc/qtcreator/creator-clang-codemodel.html
+    \title Qt Creator: Parsing C++ Files
+*/
+/*!
+    \externalpage http://qt-project.org/doc/qtcreator/creator-quick-ui-forms.html
+    \title Qt Creator: Qt Quick UI Forms
+*/
+/*!
+    \externalpage http://qt-project.org/doc/qtcreator/creator-clang-static-analyzer.html
+    \title Qt Creator: Using Clang Static Analyzer
+*/

doc/global/template/style/offline.css

@@ -2,7 +2,6 @@ body {
     font: normal 400 14px/1.2 Arial;
     margin-top: 85px;
     font-family: Arial, Helvetica;
-    color: #313131;
     text-align: left;
     margin-left: 5px;
     margin-right: 5px;
@@ -365,7 +364,9 @@ h3.fn, span.fn {
     margin: 0px;
     margin-top: 45px;
 }
-
+h3.fn code {
+    float: right;
+}
 h3.fn:target {
     background-color: #F6F6D6;
 }
@@ -711,8 +712,21 @@ Landing page
     float: left;
 }
 
-.icons1of3  h2 {
+.icons1of3 h2, .doc-column h2 {
     font-size: 15px;
     margin: 0px;
     padding: 0px;
 }
+
+div.multi-column {
+    position: relative;
+}
+
+div.multi-column div {
+    display: -moz-inline-box;
+    display: inline-block;
+    vertical-align: top;
+    margin-top: 1em;
+    margin-right: 4em;
+    width: 24em;
+}

examples/network/bearermonitor/bearermonitor.cpp

@@ -127,6 +127,9 @@ static void updateItem(QTreeWidgetItem *item, const QNetworkConfiguration &confi
 
 void BearerMonitor::configurationAdded(const QNetworkConfiguration &config, QTreeWidgetItem *parent)
 {
+    if (!config.isValid())
+        return;
+
     QTreeWidgetItem *item = new QTreeWidgetItem;
     updateItem(item, config);
 

examples/network/securesocketclient/sslclient.cpp

@@ -181,7 +181,7 @@ void SslClient::sendData()
     form->sessionInput->clear();
 }
 
-void SslClient::socketError(QAbstractSocket::SocketError error)
+void SslClient::socketError(QAbstractSocket::SocketError)
 {
     QMessageBox::critical(this, tr("Connection error"), socket->errorString());
 }

examples/network/securesocketclient/sslclient.ui

@@ -26,7 +26,7 @@
      <item row="0" column="1">
       <widget class="QLineEdit" name="hostNameEdit">
        <property name="text">
-        <string>imap.example.com</string>
+        <string>www.qt.io</string>
        </property>
       </widget>
      </item>
@@ -46,7 +46,7 @@
         <number>65535</number>
        </property>
        <property name="value">
-        <number>993</number>
+        <number>443</number>
        </property>
       </widget>
      </item>

examples/widgets/doc/src/application.qdoc

@@ -75,12 +75,12 @@
 
     \snippet mainwindows/application/mainwindow.cpp 0
 
-    We start by including \c <QtGui>, a header file that contains the
-    definition of all classes in the Qt Core and Qt GUI
+    We start by including \c <QtWidgets>, a header file that contains the
+    definition of all classes in the Qt Core, Qt GUI and Qt Widgets
     modules. This saves us from the trouble of having to include
     every class individually. We also include \c mainwindow.h.
 
-    You might wonder why we don't include \c <QtGui> in \c
+    You might wonder why we don't include \c <QtWidgets> in \c
     mainwindow.h and be done with it. The reason is that including
     such a large header from another header file can rapidly degrade
     performances. Here, it wouldn't do any harm, but it's still

examples/widgets/doc/src/dockwidgets.qdoc

@@ -55,8 +55,8 @@
 
     \snippet mainwindows/dockwidgets/mainwindow.cpp 0
 
-    We start by including \c <QtGui>, a header file that contains the
-    definition of all classes in the Qt Core and Qt GUI
+    We start by including \c <QtWidgets>, a header file that contains the
+    definition of all classes in the Qt Core, Qt GUI and Qt Widgets
     modules. This saves us from having to include
     every class individually and is especially convenient if we add new
     widgets. We also include \c mainwindow.h.

examples/widgets/widgets/mousebuttons/buttontester.cpp

@@ -41,6 +41,8 @@
 
 #include "buttontester.h"
 
+#include <QDebug>
+
 void ButtonTester::mousePressEvent(QMouseEvent *e)
 {
     int j = ButtonTester::buttonByNumber (e->button());

examples/widgets/widgets/mousebuttons/buttontester.h

@@ -41,10 +41,8 @@
 #ifndef BUTTONTESTER_H
 #define BUTTONTESTER_H
 
-#include <QtWidgets>
 #include <QTextEdit>
 #include <QString>
-#include <QDebug>
 #include <QMouseEvent>
 #include <QWheelEvent>
 

examples/widgets/widgets/mousebuttons/main.cpp

@@ -40,7 +40,10 @@
 ****************************************************************************/
 
 #include "buttontester.h"
-#include <QtGui>
+
+#include <QApplication>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 int main(int argv, char **args)
 {

mkspecs/common/clang.conf

@@ -7,6 +7,9 @@ QMAKE_COMPILER          = gcc clang llvm   # clang pretends to be gcc
 QMAKE_CC                = clang
 QMAKE_CXX               = clang++
 
+QMAKE_LINK_C            = $$QMAKE_CC
+QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
+
 QMAKE_LINK              = $$QMAKE_CXX
 QMAKE_LINK_SHLIB        = $$QMAKE_CXX
 

mkspecs/common/qcc-base.conf

@@ -11,11 +11,15 @@
 
 QMAKE_COMPILER          = rim_qcc gcc   # qcc is mostly gcc in disguise
 
+QMAKE_CFLAGS_OPTIMIZE      = -O2
+QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
+
 QMAKE_CFLAGS           += -Wno-psabi
 QMAKE_CFLAGS_DEPS      += -M
 QMAKE_CFLAGS_WARN_ON   += -Wall -W
 QMAKE_CFLAGS_WARN_OFF  += -w
-QMAKE_CFLAGS_RELEASE   += -O2
+QMAKE_CFLAGS_RELEASE   += $$QMAKE_CFLAGS_OPTIMIZE
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
 QMAKE_CFLAGS_DEBUG     += -g
 QMAKE_CFLAGS_SHLIB     += -fPIC -shared
 QMAKE_CFLAGS_STATIC_LIB += -fPIC
@@ -36,6 +40,7 @@ QMAKE_CXXFLAGS_DEPS    += $$QMAKE_CFLAGS_DEPS
 QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
 QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
 QMAKE_CXXFLAGS_DEBUG   += $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_SHLIB   += $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB

mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in

@@ -34,7 +34,7 @@
             <m2:ShowOn Tile=\"square150x150Logo\" />
           </m2:ShowNameOnTiles>
         </m2:DefaultTile>
-        <m2:SplashScreen Image=\"$${WINRT_MANIFEST.logo_splash}\" />
+        <m2:SplashScreen Image=\"$${WINRT_MANIFEST.logo_splash}\" />$${WINRT_MANIFEST.rotation_preference}
       </m2:VisualElements>
     </Application>
   </Applications>$${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies}

mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in

@@ -37,7 +37,7 @@
             <m3:ShowOn Tile=\"square150x150Logo\" />
           </m3:ShowNameOnTiles>
         </m3:DefaultTile>
-        <m3:SplashScreen Image=\"$${WINRT_MANIFEST.logo_480x800}\" />
+        <m3:SplashScreen Image=\"$${WINRT_MANIFEST.logo_480x800}\" />$${WINRT_MANIFEST.rotation_preference}
       </m3:VisualElements>
     </Application>
   </Applications>$${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies}

mkspecs/devices/linux-rasp-pi-g++/qmake.conf

@@ -4,8 +4,6 @@
 
 include(../common/linux_device_pre.conf)
 
-QT_QPA_DEFAULT_PLATFORM = wayland
-
 QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/opt/vc/lib
 
 QMAKE_LIBDIR_OPENGL_ES2 = $$[QT_SYSROOT]/opt/vc/lib
@@ -21,7 +19,6 @@ QMAKE_LIBS_EGL          = -lEGL -lGLESv2
 contains(DISTRO, squeeze) {
     #Debian Squeeze: Legacy everything
     QMAKE_LIBS_OPENGL_ES2   = -lGLESv2 -lEGL
-    QT_QPA_DEFAULT_PLATFORM = eglfs
 } else:contains(DISTRO, arch) {
     #On principle: no wizardry required
 } else {

mkspecs/features/configure.prf

@@ -1,4 +1,7 @@
-equals(MAKEFILE_GENERATOR, UNIX) {
+QMAKE_MAKE = $$(MAKE)
+!isEmpty(QMAKE_MAKE) {
+    # We were called recursively. Use the right make, as MAKEFLAGS may be set as well.
+} else:equals(MAKEFILE_GENERATOR, UNIX) {
     QMAKE_MAKE = make
 } else:equals(MAKEFILE_GENERATOR, MINGW) {
     !equals(QMAKE_HOST.os, Windows): \

mkspecs/features/mac/default_post.prf

@@ -35,6 +35,30 @@ qt:!isEmpty(QT_CONFIG) {
             QMAKE_LFLAGS   += -stdlib=libstdc++
         }
     }
+    # If Qt was built with shared libraries with rpath support and project does
+    # not specify own rpaths (including empty list) add one pointing to Qt
+    # libraries. This applies only to apps, since all loaded libraries inherit
+    # rpaths from current process executable.
+    else:!if(host_build:force_bootstrap):equals(TEMPLATE, app):!defined(QMAKE_RPATHDIR, var):contains(QT_CONFIG, rpath) {
+        # If app is outside of Qt SDK prefix use absolute path to Qt libraries,
+        # otherwise make it relative, so all SDK tools and examples work when
+        # relocated.
+        # Tests are an exception, since they are launched in their build not
+        # install location by CI, so we cannot use relative rpaths there.
+        if(!contains(target.path, "$$re_escape($$[QT_INSTALL_PREFIX])/.*")|\
+            contains(target.path, "$$re_escape($$[QT_INSTALL_TESTS])/.*")) {
+            QMAKE_RPATHDIR = $$[QT_INSTALL_LIBS]
+        } else {
+            app_bundle {
+                ios:  binpath = $$target.path/$${TARGET}.app
+                else: binpath = $$target.path/$${TARGET}.app/Contents/MacOS
+            } else {
+                binpath = $$target.path
+            }
+            QMAKE_RPATHDIR = @loader_path/$$relative_path($$[QT_INSTALL_LIBS], $$binpath)
+            unset(binpath)
+        }
+    }
 }
 
 macx-xcode:!isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) {

mkspecs/features/mac/sdk.prf

@@ -9,8 +9,12 @@ isEmpty(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path) {
     QMAKE_MAC_SDK_PATH = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version Path 2>/dev/null")
     isEmpty(QMAKE_MAC_SDK_PATH): error("Could not resolve SDK path for \'$$QMAKE_MAC_SDK\'")
     cache(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path, set stash, QMAKE_MAC_SDK_PATH)
+    QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version SDKVersion 2>/dev/null")
+    isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$$QMAKE_MAC_SDK\'")
+    cache(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.version, set stash, QMAKE_MAC_SDK_VERSION)
 } else {
     QMAKE_MAC_SDK_PATH = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path)
+    QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.version)
 }
 
 !equals(MAKEFILE_GENERATOR, XCODE) {