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

Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5
StrataSource · Jun 27, 2013 · 5722009 · 5722009
2 parents 7ed0242 + 241eca3
commit 5722009
Show file tree

Hide file tree

Showing 89 changed files with 763 additions and 418 deletions.
diff --git a/config.tests/unix/arch.test b/config.tests/unix/arch.test
@@ -44,8 +44,8 @@ else
 fi
 
 if strings - $binary 2>/dev/null | \
-    awk -F: '/==Qt=magic=Qt== Architecture/ { print "'$VARPREFIX'_ARCH=\"" $2 "\"" }
-             /==Qt=magic=Qt== Sub-architecture/ { print "'$VARPREFIX'_CPUFEATURES=\"" $2 "\"" }' > "$RESULTFILE"
+    awk -F: '/\=\=Qt\=magic\=Qt\=\= Architecture/ { print "'$VARPREFIX'_ARCH=\"" $2 "\"" }
+             /\=\=Qt\=magic\=Qt\=\= Sub-architecture/ { print "'$VARPREFIX'_CPUFEATURES=\"" $2 "\"" }' > "$RESULTFILE"
 then
     [ "$VERBOSE" = "yes" ] && echo "    Found architecture in binary" && \
         cat "$RESULTFILE"

diff --git a/configure b/configure
@@ -61,6 +61,13 @@ if [ -f "$LICENSE_FILE" ]; then
     diff "${LICENSE_FILE}.tmp" "${LICENSE_FILE}" >/dev/null 2>&1 || LICENSE_FILE="${LICENSE_FILE}.tmp"
 fi
 
+# do this early so we don't store it in config.status
+CFG_TOPLEVEL=
+if [ x"$1" = x"-top-level" ]; then
+    CFG_TOPLEVEL=yes
+    shift
+fi
+
 # later cache the command line in config.status
 OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"`
 
@@ -6067,7 +6074,7 @@ case "$XPLATFORM" in
 	;;
     solaris-cc*)
         # Check the compiler version
-        case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in
+        case `${QMAKE_CONF_COMPILER} -V 2>&1 | $AWK '{print $4}'` in
             5.[012345678])
                 canBuildWebKit="no"
                 canBuildQtXmlPatterns="no"
@@ -6693,11 +6700,9 @@ report_support()
             return
             :;
     esac
-    local heading
     heading=$1
     shift
 
-    local value
     value=$1
     shift
 
@@ -6907,14 +6912,23 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null
 #-------------------------------------------------------------------------------
 
 if [ "$CFG_PROCESS" != "no" ]; then
+(   # fork to make the cd stay local
+
+    relpathMangled=$relpath
+    if [ -n "$CFG_TOPLEVEL" ]; then
+        relpathMangled=`dirname "$relpath"`
+        cd ..
+    fi
 
     if [ "$CFG_PROCESS" = "full" ]; then
         echo "Creating makefiles. Please wait..."
-        "$outpath/bin/qmake" -r "$relpath"
+        "$outpath/bin/qmake" -r "$relpathMangled"
         echo "Done"
     else
-        "$outpath/bin/qmake" "$relpath"
+        "$outpath/bin/qmake" "$relpathMangled"
     fi
+
+)
 fi
 
 #-------------------------------------------------------------------------------

diff --git a/dist/changes-5.1.0 b/dist/changes-5.1.0
@@ -88,7 +88,16 @@ QtGui
 QtNetwork
 ---------
 
- -
+ - QNetworkAccessManager / QNetworkReply:
+    * Add a new encrypted() signal so that applications can perform
+      additional checks on the certificate chain.
+ - QSslSocket:
+    * Support for sending intermediate certificates when QSslSocket is used
+      as a server, and when using client certificates.
+ - HTTPS internals:
+    * SSL sessions are re-used by default.
+ - QHostInfo:
+    * Allow QHostInfo::lookupHost() with no receiver to warm the DNS cache.
 
 QtWidgets
 ---------

diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf
@@ -32,11 +32,10 @@
 # manifestmeta.global.names           = *
 # manifestmeta.global.tags            = qt5
 
-manifestmeta.filters                =   highlighted webkit1 webkit2
+manifestmeta.filters                =   highlighted webkit1 webkit2 android
 
 manifestmeta.highlighted.names      =   "QtQuick/Qt Quick Demo - Same Game" \
                                         "QtQuick/Qt Quick Demo - Photo Surface" \
-                                        "QtQuick/Qt Quick Demo - Tweet Search" \
                                         "QtQuick/Qt Quick Demo - Maroon*" \
                                         "QtQuick/Qt Quick Demo - Calqlatr" \
                                         "QtQuick/Qt Quick Particles Examples - Emitters" \
@@ -70,3 +69,102 @@ manifestmeta.webkit2.names          =  "QtWebKitExamples/Flickr View Example" \
                                        "QtWebKitExamples/YouTube View Example"
 
 manifestmeta.webkit2.tags           =   webkit2
+
+manifestmeta.android.names          =  "QtQuick/Qt Quick Demo - Maroon*" \
+                                       "QtQuick/Qt Quick Demo - Calqlatr" \
+                                       "QtWidgets/Application Chooser Example" \
+                                       "QtWidgets/Stickman Example" \
+                                       "QtWidgets/Move Blocks Example" \
+                                       "QtWidgets/Border Layout Example" \
+                                       "QtWidgets/Dynamic Layouts Example" \
+                                       "QtWidgets/Flow Layout Example" \
+                                       "QtWidgets/MDI Example" \
+                                       "QtWidgets/Dock Widgets Example" \
+                                       "QtWidgets/Recent Files Example" \
+                                       "QtWidgets/Menus Example" \
+                                       "QtWidgets/Concentric Circles Example" \
+                                       "QtWidgets/Gradients" \
+                                       "QtWidgets/Font Sampler Example" \
+                                       "QtWidgets/Path Stroking" \
+                                       "QtWidgets/Transformations Example" \
+                                       "QtWidgets/Syntax Highlighter Example" \
+                                       "QtWidgets/Calendar Example" \
+                                       "QtWidgets/Movie Example" \
+                                       "QtWidgets/Validators Example" \
+                                       "QtWidgets/Analog Clock Example" \
+                                       "QtWidgets/Calculator Example" \
+                                       "QtWidgets/Mouse Button Tester" \
+                                       "QtWidgets/Character Map Example" \
+                                       "QtWidgets/Wiggly Example" \
+                                       "QtWidgets/Digital Clock Example" \
+                                       "QtWidgets/Elided Label Example" \
+                                       "QtWidgets/Image Viewer Example" \
+                                       "QtWidgets/Sliders Example" \
+                                       "QtWidgets/Tetrix Example" \
+                                       "QtWidgets/Group Box Example" \
+                                       "QtWidgets/Spin Boxes Example" \
+                                       "QtWidgets/Undo Framework" \
+                                       "QtWidgets/Regular Expressions Example" \
+                                       "QtWidgets/Colliding Mice Example" \
+                                       "QtWidgets/Basic Graphics Layouts Example" \
+                                       "QtWidgets/Boxes" \
+                                       "QtWidgets/40000 Chips" \
+                                       "QtWidgets/Diagram Scene Example" \
+                                       "QtWidgets/Drag and Drop Robot Example" \
+                                       "QtWidgets/Elastic Nodes Example" \
+                                       "QtWidgets/Pad Navigator Example" \
+                                       "QtWidgets/Anchor Layout Example" \
+                                       "QtWidgets/Weather Anchor Layout Example" \
+                                       "QtConcurrent/Image Scaling Example" \
+                                       "QtConcurrent/QtConcurrent Progress Dialog Example" \
+                                       "QtNetwork/Torrent Example" \
+                                       "QtNetwork/Network Chat Example" \
+                                       "QtSQL/Master Detail Example" \
+                                       "QtOpenGL/Cube OpenGL ES 2.0 example" \
+                                       "QtOpenGL/Textures Example" \
+                                       "QtLinguist/Arrow Pad Example" \
+                                       "QtGui/Raster Window Example" \
+                                       "QtGui/Analog Clock Window Example" \
+                                       "QtMultimedia/Video Widget Example" \
+                                       "QtMultimedia/Media Player Example" \
+                                       "QtSVG/Text Object Example" \
+                                       "QtQML/Qt Quick Examples - XMLHttpRequest" \
+                                       "QtQuick/Qt Quick Particles Examples - *" \
+                                       "QtQuick/Qt Quick Examples - Touch Interaction" \
+                                       "QtQuick/Scene Graph - *" \
+                                       "QtQuick/Qt Quick Examples - Image Elements" \
+                                       "QtQuick/Qt Quick Examples - Key Interaction" \
+                                       "QtQuick/Qt Quick Examples - Text" \
+                                       "QtQuick/Qt Quick Examples - Animation" \
+                                       "QtQuick/Qt Quick Examples - Shader Effects" \
+                                       "QtQuick/Qt Quick Examples - Canvas" \
+                                       "QtWidgets/Interview" \
+                                       "QtWidgets/Spreadsheet" \
+                                       "QtWidgets/Pixelator Example" \
+                                       "QtWidgets/Class Wizard Example" \
+                                       "QtWidgets/Animated Tiles Example" \
+                                       "QtWidgets/Basic Layouts Example" \
+                                       "QtWidgets/Application Example" \
+                                       "QtWidgets/Affine Transformations" \
+                                       "QtWidgets/Image Composition Example" \
+                                       "QtWidgets/Basic Drawing Example" \
+                                       "QtWidgets/Vector Deformation" \
+                                       "QtWidgets/Painter Paths Example" \
+                                       "QtWidgets/Text Edit" \
+                                       "QtWidgets/Style Sheet Example" \
+                                       "QtWidgets/Code Editor Example" \
+                                       "QtWidgets/Window Flags Example" \
+                                       "QtWidgets/Scribble Example" \
+                                       "QtWidgets/Shaped Clock Example" \
+                                       "QtWidgets/Line Edits Example" \
+                                       "QtWidgets/Calendar Widget Example" \
+                                       "QtWidgets/Completer Example" \
+                                       "QtWidgets/I18N Example" \
+                                       "QtQML/Extending QML - Grouped Properties Example" \
+                                       "QtQML/Extending QML - Methods Example" \
+                                       "QtQML/Extending QML - Signal Support Example" \
+                                       "QtQML/Extending QML - Attached Properties Example" \
+                                       "QtQuick/Qt Quick Examples - Window and Screen" \
+                                       "QtWidgets/Address Book Example"
+
+manifestmeta.android.tags              =   android
diff --git a/examples/widgets/dialogs/findfiles/window.cpp b/examples/widgets/dialogs/findfiles/window.cpp
@@ -63,7 +63,6 @@ Window::Window(QWidget *parent)
 
 //! [1]
     QGridLayout *mainLayout = new QGridLayout;
-    mainLayout->setSizeConstraint(QLayout::SetNoConstraint);
     mainLayout->addWidget(fileLabel, 0, 0);
     mainLayout->addWidget(fileComboBox, 0, 1, 1, 2);
     mainLayout->addWidget(textLabel, 1, 0);

diff --git a/examples/widgets/dialogs/tabdialog/tabdialog.cpp b/examples/widgets/dialogs/tabdialog/tabdialog.cpp
@@ -65,7 +65,6 @@ TabDialog::TabDialog(const QString &fileName, QWidget *parent)
 
 //! [4]
     QVBoxLayout *mainLayout = new QVBoxLayout;
-    mainLayout->setSizeConstraint(QLayout::SetNoConstraint);
     mainLayout->addWidget(tabWidget);
     mainLayout->addWidget(buttonBox);
     setLayout(mainLayout);

diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf
@@ -16,6 +16,8 @@ QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g -gdwarf-2
 
 QMAKE_LFLAGS_STATIC_LIB += -all_load
 
+QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
+
 QMAKE_OBJCFLAGS_PRECOMPILE       = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
 QMAKE_OBJCFLAGS_USE_PRECOMPILE   = $$QMAKE_CFLAGS_USE_PRECOMPILE
 QMAKE_OBJCXXFLAGS_PRECOMPILE     = -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}

diff --git a/mkspecs/features/cmake_functions.prf b/mkspecs/features/cmake_functions.prf
@@ -54,7 +54,7 @@ defineReplace(cmakeProcessLibs) {
     variable = $$1
     out =
     for(v, variable) {
-        if(!equals(v, -framework):!equals(v, -L.*)) {
+        if(!equals(v, -framework):!contains(v, -L.*)) {
             v ~= s,^-l,,
             v ~= s,^-lib,,
             v ~= s,.lib$,,

diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
@@ -55,6 +55,17 @@ contains(CMAKE_BIN_DIR, "^\\.\\./.*") {
     CMAKE_BIN_DIR_IS_ABSOLUTE = True
 }
 
+!isEmpty(DLLDESTDIR):!static:!staticlib {
+    CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX])
+    contains(CMAKE_DLL_DIR, "^\\.\\./.*") {
+        CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/
+        CMAKE_DLL_DIR_IS_ABSOLUTE = True
+    }
+} else {
+    CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
+    CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
+}
+
 static|staticlib:CMAKE_STATIC_TYPE = true
 
 unix:contains(QT_CONFIG, reduce_relocations):CMAKE_ADD_FPIE_FLAGS = "true"

diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -46,10 +46,10 @@ endmacro()
 macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
 
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-    set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${LIB_LOCATION}\")
+!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+    set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
 !!ELSE
-    set(imported_location \"IMPORTED_LOCATION_${Configuration}\" \"$${CMAKE_LIB_DIR}${LIB_LOCATION}\")
+    set(imported_location \"IMPORTED_LOCATION_${Configuration}\" \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
 !!ENDIF
     _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
     set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
@@ -187,22 +187,26 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 
 !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
 !!IF isEmpty(CMAKE_DEBUG_TYPE)
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
     if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
-!!ELSE
-    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" AND EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-!!ELSE
-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
     if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
+        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
+!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
+    if (EXISTS
+!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
 !!ELSE
-    if (EXISTS \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" AND EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
+        \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
 !!ENDIF
-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
-        _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
+      AND EXISTS
+!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
 !!ELSE
+        \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
+!!ENDIF
         _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
 !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
     endif()
@@ -220,22 +224,26 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 
 !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
 !!IF isEmpty(CMAKE_RELEASE_TYPE)
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
     if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
-!!ELSE
-    if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" AND EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-!!ELSE
-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
+!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
     if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
+        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
+!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
+    if (EXISTS
+!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
+        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
 !!ELSE
-    if (EXISTS \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" AND EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
+        \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
 !!ENDIF
-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
-        _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
+      AND EXISTS
+!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+        \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ELSE
+        \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
+!!ENDIF
         _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
     endif()

diff --git a/mkspecs/features/ios/default_pre.prf b/mkspecs/features/ios/default_pre.prf
@@ -1,5 +1,5 @@
 # Unset makefile generator, so we can auto-detect value in default_post
-unset(MAKEFILE_GENERATOR)
+!macx-xcode: unset(MAKEFILE_GENERATOR)
 
 load(default_pre)
 

diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
@@ -1,19 +1,22 @@
 load(default_post)
 !no_objective_c:CONFIG += objective_c
 
-# Pick a suitable default architecture for qmake-based applications.
-# If the Qt package contains one of x86 and x86_64, pick that one. If it
-# contains both then use the compiler default. Make a similiar decision for
-# PowerPC-based systems. Note that this logic assumes that Qt has been
-# configured with an architecture that is usable on the system.
 qt:!isEmpty(QT_CONFIG) {
+    # Pick a suitable default architecture for qmake-based applications.
+    # If the Qt package contains one of x86 and x86_64, pick that one. If it
+    # contains both then use the compiler default. Make a similar decision for
+    # PowerPC-based systems. Note that this logic assumes that Qt has been
+    # configured with an architecture that is usable on the system.
     contains(QMAKE_HOST.arch, ppc)|contains(QMAKE_HOST.arch, "Power Macintosh") {
         !contains(QT_CONFIG, ppc64):contains(QT_CONFIG, ppc):CONFIG += ppc
         contains(QT_CONFIG, ppc64):!contains(QT_CONFIG, ppc):CONFIG += ppc64
     } else {
         !contains(QT_CONFIG, x86_64):contains(QT_CONFIG, x86):CONFIG += x86
         contains(QT_CONFIG, x86_64):!contains(QT_CONFIG, x86):CONFIG += x86_64
     }
+
+    # Ensure that C++11 is always used when linking against a static Qt build
+    contains(QT_CONFIG, static):contains(QT_CONFIG, c++11): CONFIG += c++11
 }
 
 isEmpty(_QMAKE_CACHE_) {