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

Conflicts:
	src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
	src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp
	tools/configure/configureapp.cpp

Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0

bin/syncqt.pl

@@ -805,7 +805,9 @@ sub isQpaHeader
     die "No such module: $lib" unless(defined $modules{$lib});
 
     #iteration info
-    my @dirs = split(/;/, $modules{$lib});
+    my $module = $modules{$lib};
+    my $is_qt = !($module =~ s/^!//);
+    my @dirs = split(/;/, $module);
     my $dir = $dirs[0];
 
     my $pathtoheaders = "";
@@ -914,7 +916,7 @@ sub isQpaHeader
                         }
 
                         my $iheader = $subdir . "/" . $header;
-                        my @classes = $public_header && !$minimal ? classNames($iheader) : ();
+                        my @classes = $public_header && (!$minimal && $is_qt) ? classNames($iheader) : ();
                         if($showonly) {
                             print "$header [$lib]\n";
                             foreach(@classes) {
@@ -1024,7 +1026,7 @@ sub isQpaHeader
         "#include \"".lc($lib)."version.h\"\n" .
         "#endif\n";
 
-    unless ($showonly || $minimal) {
+    unless ($showonly || $minimal || !$is_qt) {
         # create deprecated headers
         my $first = 1;
         while (my ($header, $include) = each %{$deprecatedheaders{$lib}}) {
@@ -1112,7 +1114,9 @@ sub isQpaHeader
         my $master_include = "$out_basedir/include/$lib/$lib";
         $pri_install_files .= fixPaths($master_include, $dir) . " ";
         writeFile($master_include, $master_contents, $lib, "master header");
+    }
 
+    unless ($showonly || $minimal) {
         #handle the headers.pri for each module
         my $headers_pri_contents = "";
         $headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";
@@ -1126,6 +1130,7 @@ sub isQpaHeader
 
 if($check_includes) {
     foreach my $lib (@modules_to_sync) {
+        next if ($modules{$lib} =~ /^!/);
             #calc subdirs
             my @subdirs = listSubdirs(map { s/^\^//; $_ } split(/;/, $modules{$lib}));
 

configure

@@ -876,6 +876,7 @@ CFG_SSE=auto
 CFG_FONTCONFIG=auto
 CFG_LIBFREETYPE=auto
 CFG_SQL_AVAILABLE=
+QT_ALL_BUILD_PARTS=" libs tools examples tests "
 QT_DEFAULT_BUILD_PARTS="libs tools examples"
 CFG_BUILD_PARTS=""
 CFG_NOBUILD_PARTS=""
@@ -1113,7 +1114,45 @@ while [ "$#" -gt 0 ]; do
         VAL=no
         ;;
     #Qt style options that pass an argument
-    -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-hostlibdir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version)
+    -prefix| \
+    -docdir| \
+    -headerdir| \
+    -plugindir| \
+    -importdir| \
+    -qmldir| \
+    -archdatadir| \
+    -datadir| \
+    -libdir| \
+    -bindir| \
+    -libexecdir| \
+    -translationdir| \
+    -sysconfdir| \
+    -examplesdir| \
+    -testsdir| \
+    -hostdatadir| \
+    -hostbindir| \
+    -hostlibdir| \
+    -sysroot| \
+    -depths| \
+    -make| \
+    -nomake| \
+    -skip| \
+    -platform| \
+    -xplatform| \
+    -device| \
+    -device-option| \
+    -sdk| \
+    -arch| \
+    -host-arch| \
+    -mysql_config| \
+    -qpa| \
+    -qconfig| \
+    -android-sdk| \
+    -android-ndk| \
+    -android-ndk-platform| \
+    -android-ndk-host| \
+    -android-arch| \
+    -android-toolchain-version)
         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
         shift
         VAL="$1"
@@ -1392,10 +1431,22 @@ while [ "$#" -gt 0 ]; do
         fi
         ;;
     nomake)
+        if [ -n "${QT_ALL_BUILD_PARTS%%* $VAL *}" ]; then
+            echo "Unknown part $VAL passed to -nomake." >&2
+            exit 1
+        fi
 	CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS $VAL"
         ;;
     make)
-	CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL"
+        if [ "$VAL" = "no" ]; then
+            UNKNOWN_OPT=yes
+        else
+            if [ -n "${QT_ALL_BUILD_PARTS%%* $VAL *}" ]; then
+                echo "Unknown part $VAL passed to -make." >&2
+                exit 1
+            fi
+            CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL"
+        fi
         ;;
     skip)
         VAL=qt${VAL#qt}
@@ -4000,10 +4051,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
         if [ '!' -z "$D_FLAGS" ]; then
             EXTRA_CFLAGS="$EXTRA_CFLAGS $D_FLAGS"
         fi
-        QMAKE_BIN_DIR="$QT_INSTALL_BINS"
-        [ -z "$QMAKE_BIN_DIR" ] && QMAKE_BIN_DIR="${QT_INSTALL_PREFIX}/bin"
-        QMAKE_DATA_DIR="$QT_INSTALL_ARCHDATA"
-        [ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${QT_INSTALL_PREFIX}"
         echo >>"$mkfile"
 	adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`
 	adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'`
@@ -4020,11 +4067,9 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
         echo "QT_VERSION = $QT_VERSION" >> "$mkfile"
         echo "EXTRA_CFLAGS = $EXTRA_CFLAGS" >> "$mkfile"
         echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile"
-        echo "QTOBJS = $EXTRA_OBJS" >> "$mkfile"
-        echo "QTSRCS = $EXTRA_SRCS" >> "$mkfile"
+        echo "QTOBJS =" $EXTRA_OBJS >> "$mkfile"
+        echo "QTSRCS =" $EXTRA_SRCS >> "$mkfile"
         echo "LFLAGS = $EXTRA_LFLAGS" >> "$mkfile"
-        echo "QT_INSTALL_BINS = \$(INSTALL_ROOT)$QMAKE_BIN_DIR" >> "$mkfile"
-        echo "QT_INSTALL_DATA = \$(INSTALL_ROOT)$QMAKE_DATA_DIR" >> "$mkfile"
         echo "EXEEXT = $EXEEXT" >> "$mkfile"
         echo "RM_F = rm -f" >> "$mkfile"
         echo "RM_RF = rm -rf" >> "$mkfile"
@@ -6981,7 +7026,7 @@ fi
 MAKE=`basename "$MAKE"`
 echo
 echo Qt is now configured for building. Just run \'$MAKE\'.
-if [ "$relpath" = "$QT_INSTALL_PREFIX" ]; then
+if [ "$outpath" = "$QT_INSTALL_PREFIX" ]; then
     echo Once everything is built, Qt is installed.
     echo You should not run \'$MAKE install\'.
 else

mkspecs/features/cmake_functions.prf

@@ -45,7 +45,7 @@ defineReplace(cmakePortablePaths) {
     variable = $$1
     out =
     for(v, variable) {
-        out += ${CMAKE_FIND_ROOT_PATH}$$cmakeTargetPath($$v)
+        out += $$[QT_SYSROOT]$$cmakeTargetPath($$v)
     }
     return ($$join(out, ";"))
 }

mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

@@ -104,7 +104,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
 !!ENDIF
 
-    foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS} ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
+    foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS}
+!!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
+                 ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS}
+!!ENDIF
+                 )
         _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${_dir})
     endforeach()
 

mkspecs/features/qml_plugin.prf

@@ -86,7 +86,7 @@ load(qt_common)
         qtAddToolEnv(QMLPLUGINDUMP, importpath)
         TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, )
         qmltypes.target = qmltypes
-        qmltypes.commands = $$QMLPLUGINDUMP $$replace(TARGETPATHBASE, /, .) $$IMPORT_VERSION > $$QMLTYPEFILE
+        qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable $$replace(TARGETPATHBASE, /, .) $$IMPORT_VERSION > $$QMLTYPEFILE
         qmltypes.depends = $$QMAKE_RESOLVED_TARGET
     } else {
         qmltypes.CONFIG += recursive

mkspecs/features/qt_android_deps.prf

@@ -13,7 +13,7 @@
 # of the module on JNI-based libraries etc. Used for deployment of an Android
 # app.
 
-ANDROID_DEPENDS_DIR = $$MODULE_QMAKE_OUTDIR/lib/
+ANDROID_DEPENDS_DIR = $$MODULE_BASE_OUTDIR/lib/
 DEPENDENCY_FILE = $$ANDROID_DEPENDS_DIR$$TARGET-android-dependencies.xml
 
 !build_pass {

mkspecs/features/qt_build_paths.prf

@@ -11,12 +11,13 @@
 
 # Find the module's source root dir.
 isEmpty(_QMAKE_CONF_): error("Project has no top-level .qmake.conf file.")
-MODULE_PROFILE_DIR = $$dirname(_QMAKE_CONF_)
-isEmpty(MODULE_BASE_DIR): MODULE_BASE_DIR = $$MODULE_PROFILE_DIR
-isEmpty(MODULE_BASE_OUTDIR): MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_DIR)
+MODULE_BASE_INDIR = $$dirname(_QMAKE_CONF_)
+MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_INDIR)
+!isEmpty(MODULE_BASE_DIR): MODULE_SYNCQT_DIR = $$MODULE_BASE_DIR    # compat for webkit
+isEmpty(MODULE_SYNCQT_DIR): MODULE_SYNCQT_DIR = $$MODULE_BASE_INDIR
 isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR
 
-exists($$MODULE_PROFILE_DIR/.git): \
+exists($$MODULE_BASE_INDIR/.git): \
     CONFIG += git_build
 
 !prefix_build {

mkspecs/features/qt_config.prf

@@ -15,9 +15,9 @@ QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri
    for(dir, QMAKE_MODULE_PATH) {
       debug(1, "Loading modules from $${dir}")
       for(mod, $$list($$files($$dir/qt_*.pri))) {
-         # For installed Qt these paths will be common for all modules
-         # For development these will vary per module, and syncqt will override the value in the
-         # qt_<module>.pri forwarding file
+         # For installed Qt these paths will be common for all modules.
+         # For uninstalled prefix builds these will vary per module, via the
+         # forwarding module pri files. Keep qt_module_pris.prf in sync with this!
          QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS]
          QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS]
          QT_MODULE_HOST_LIB_BASE = $$[QT_HOST_LIBS]

mkspecs/features/qt_functions.prf

@@ -26,11 +26,10 @@ defineTest(qtAddLibrary) {
     warning("qtAddLibrary() is deprecated. Use qtAddModule() or QT+= instead.")
 
     # Reverse-engineer the module name from the library name.
-    for(var, $$list($$find($$list($$enumerate_vars()), ^QT\\.[^.]+\\.name$))) {
-        isEqual($$var, $$1) {
-            var ~= s,^QT\\.([^.]+)\\.name$,\\1,
-            qtAddModule($$var, , LIBS):return(true):break()
-            return(false):break() # Yes, the break is insanity. But necessary.
+    for(var, QT_MODULES) {
+        isEqual(QT.$${var}.name, $$1) {
+            qtAddModule($$var, , LIBS)
+            return(true):break() # Yes, the break is insanity. But necessary.
         }
     }
     error("No module matching library '$$1' found.")
@@ -131,7 +130,6 @@ defineTest(qtAddModule) {
     export(QMAKE_RPATHDIR)
     export(QMAKE_RPATHLINKDIR)
     export(PRE_TARGETDEPS)
-    return(true)
 }
 
 # qt variable, libs variable

mkspecs/features/qt_module_headers.prf

@@ -21,7 +21,7 @@ load(qt_build_paths)
         QMAKE_SYNCQT += -module $$MODULE_INCNAME -version $$VERSION
     }
     QMAKE_SYNCQT += \
-        -outdir $$MODULE_BASE_OUTDIR $$MODULE_BASE_DIR
+        -outdir $$MODULE_BASE_OUTDIR $$MODULE_SYNCQT_DIR
     !silent: message($$QMAKE_SYNCQT)
     system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT")
 }
@@ -32,11 +32,11 @@ minimal_syncqt: return()
 git_build: \
     INC_PATH = $$MODULE_BASE_OUTDIR
 else: \
-    INC_PATH = $$MODULE_BASE_DIR
+    INC_PATH = $$MODULE_BASE_INDIR
 include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true)
 
 autogen_warning = \
-    "/* This file was generated by qmake with the info from <root>/$$relative_path($$_PRO_FILE_, $$MODULE_BASE_DIR). */"
+    "/* This file was generated by qmake with the info from <root>/$$relative_path($$_PRO_FILE_, $$MODULE_BASE_INDIR). */"
 
 # Create a module master depends header
 MODULE_MASTER_DEPS_HEADER = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/$${MODULE_INCNAME}Depends

mkspecs/features/qt_module_pris.prf

@@ -10,8 +10,17 @@
 #
 
 load(qt_build_paths)
+# Pre-generated headers in the source tree and
+# - shadow build or
+# - non-shadow non-prefix build of a module which is not qtbase (because the build-time
+#   generated headers all end up in qtbase).
+!git_build:if(!equals(_PRO_FILE_PWD_, $$OUT_PWD) \
+              |if(!prefix_build:!equals(MODULE_BASE_INDIR, $$[QT_HOST_PREFIX]))): \
+    CONFIG += split_incpath
+force_independent|split_incpath: \
+    CONFIG += need_fwd_pri
 MODULE_FWD_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_lib_$${MODULE}.pri
-force_independent: \
+need_fwd_pri: \
     MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri
 else: \
     MODULE_PRI = $$MODULE_FWD_PRI
@@ -56,18 +65,22 @@ else: \
         MODULE_PRIVATE_INCLUDES = \$\$QT_MODULE_INCLUDE_BASE/$$MODULE_INCNAME/$$VERSION \
                                   \$\$QT_MODULE_INCLUDE_BASE/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME
     }
-    !git_build:if(!equals(_PRO_FILE_PWD_, $$OUT_PWD) \
-                  |if(!prefix_build:!equals(MODULE_BASE_DIR, $$[QT_HOST_PREFIX]))) {
-        pub_inc = $$replace(MODULE_INCLUDES, ^\\\$\\\$QT_MODULE_INCLUDE_BASE, $$MODULE_BASE_DIR/include)
-        priv_inc = $$replace(MODULE_PRIVATE_INCLUDES, ^\\\$\\\$QT_MODULE_INCLUDE_BASE, $$MODULE_BASE_DIR/include)
-        force_independent {
-            MODULE_FWD_PRI_CONT_SUFFIX = \
-                "QT.$${MODULE}.includes += $$pub_inc" \
-                "QT.$${MODULE}.private_includes = $$priv_inc"
-        } else {
-            MODULE_INCLUDES += $$pub_inc
-            MODULE_PRIVATE_INCLUDES = $$priv_inc
-        }
+    split_incpath: \
+        MODULE_SHADOW_INCLUDES = $$replace(MODULE_INCLUDES, ^\\\$\\\$QT_MODULE_INCLUDE_BASE, \
+                                                            $$MODULE_BASE_OUTDIR/include)
+    MODULE_INCLUDES += $$MODULE_AUX_INCLUDES
+    MODULE_PRIVATE_INCLUDES += $$MODULE_PRIVATE_AUX_INCLUDES
+    internal_module {
+        MODULE_PRIVATE_INCLUDES = $$MODULE_INCLUDES $$MODULE_PRIVATE_INCLUDES
+        MODULE_INCLUDES =
+        MODULE_PRIVATE_SHADOW_INCLUDES = $$MODULE_SHADOW_INCLUDES
+        MODULE_SHADOW_INCLUDES =
+    }
+    split_incpath {
+        !isEmpty(MODULE_SHADOW_INCLUDES): \
+            MODULE_FWD_PRI_CONT_SUFFIX += "QT.$${MODULE}.includes += $$MODULE_SHADOW_INCLUDES"
+        !isEmpty(MODULE_PRIVATE_SHADOW_INCLUDES): \
+            MODULE_FWD_PRI_CONT_SUFFIX += "QT.$${MODULE}.private_includes += $$MODULE_PRIVATE_SHADOW_INCLUDES"
     }
     MODULE_PRI_CONT = \
         "QT.$${MODULE}.VERSION = $${VERSION}" \
@@ -98,12 +111,17 @@ else: \
     write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.")
     MODULE_PRI_FILES = $$MODULE_PRI
 
-    force_independent {
+    need_fwd_pri {
+
+        split_incpath: \
+            MODULE_BASE_INCDIR = $$MODULE_BASE_INDIR
+        else: \
+            MODULE_BASE_INCDIR = $$MODULE_BASE_OUTDIR
 
         # Create a forwarding module .pri file
         MODULE_FWD_PRI_CONT = \
             "QT_MODULE_BIN_BASE = $$MODULE_BASE_OUTDIR/bin" \
-            "QT_MODULE_INCLUDE_BASE = $$MODULE_BASE_OUTDIR/include" \
+            "QT_MODULE_INCLUDE_BASE = $$MODULE_BASE_INCDIR/include" \
             "QT_MODULE_IMPORT_BASE = $$MODULE_BASE_OUTDIR/imports" \
             "QT_MODULE_QML_BASE = $$MODULE_BASE_OUTDIR/qml" \
             "QT_MODULE_LIB_BASE = $$MODULE_BASE_OUTDIR/lib" \
@@ -116,9 +134,9 @@ else: \
         touch($$MODULE_FWD_PRI, $$MODULE_PRI)
         MODULE_PRI_FILES += $$MODULE_FWD_PRI
 
-    } else { # prefix_build
+    } else {
 
-        # This is needed for the direct include() below.
+        # This is needed for the direct include() below. Mirrors qt_config.prf
         QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS]
         QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS]
         QT_MODULE_IMPORT_BASE = $$[QT_INSTALL_IMPORTS]

mkspecs/features/resources.prf

@@ -18,11 +18,11 @@ resource_combine {
        QMAKE_RESOURCE_FLAGS += -name ${QMAKE_FILE_BASE}
     }
 }
-rcc.commands = "$$QMAKE_RCC" $$QMAKE_RESOURCE_FLAGS "${QMAKE_FILE_IN}" -o "${QMAKE_FILE_OUT}"
-rcc.depend_command = "$$QMAKE_RCC" -list $$QMAKE_RESOURCE_FLAGS "${QMAKE_FILE_IN}"
+rcc.commands = $$QMAKE_RCC $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+rcc.depend_command = $$QMAKE_RCC -list $$QMAKE_RESOURCE_FLAGS ${QMAKE_FILE_IN}
 rcc.CONFIG += add_inputs_as_makefile_deps
 rcc.input = RESOURCES
 rcc.variable_out = SOURCES
 rcc.name = RCC ${QMAKE_FILE_IN}
-silent:rcc.commands = @echo rcc "${QMAKE_FILE_IN}" && $$rcc.commands
+silent:rcc.commands = @echo rcc ${QMAKE_FILE_IN} && $$rcc.commands
 QMAKE_EXTRA_COMPILERS += rcc

mkspecs/features/spec_post.prf

@@ -42,7 +42,7 @@ isEmpty(QMAKE_COMPILER) {
     else:*-llvm*: \
         QMAKE_COMPILER = gcc llvm
     else:*-clang*: \
-        QMAKE_COMPILER = clang llvm
+        QMAKE_COMPILER = gcc clang llvm
     else:*-msvc*: \
         QMAKE_COMPILER = msvc
     else: \

mkspecs/features/uic.prf

@@ -4,7 +4,7 @@ isEmpty(UI_DIR):UI_DIR = .
 isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_
 
 uic.commands = $$QMAKE_UIC ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
-uic.depend_command = "$$QMAKE_UIC" -d "${QMAKE_FILE_IN}"
+uic.depend_command = $$QMAKE_UIC -d ${QMAKE_FILE_IN}
 uic.output = $$UI_DIR/$${QMAKE_MOD_UIC}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
 uic.input = FORMS
 uic.variable_out = GENERATED_FILES