Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	qmake/library/qmakeevaluator.cpp

One side changed the iterator to use ranged-for, the other changed its
body; they only conflicted because the latter had to add braces around
the body, intruding on the for-line.  Trivial resolution.

Change-Id: Ib487bc3bd6e3c5225db15f94b9a8f6caaa33456b

examples/widgets/painting/pathstroke/pathstroke.cpp

@@ -494,7 +494,7 @@ void PathStrokeRenderer::initializePoints()
     m_vectors.clear();
 
     QMatrix m;
-    qreal rot = 360 / count;
+    qreal rot = 360.0 / count;
     QPointF center(width() / 2, height() / 2);
     QMatrix vm;
     vm.shear(2, -1);

mkspecs/common/mac.conf

@@ -31,6 +31,7 @@ QMAKE_LIBS_THREAD       =
 
 QMAKE_DSYMUTIL          = dsymutil
 QMAKE_STRIP             = strip
+QMAKE_STRIPFLAGS_LIB   += -S -x
 
 QMAKE_AR                = ar cq
 QMAKE_RANLIB            = ranlib -s

mkspecs/features/file_copies.prf

@@ -1,8 +1,7 @@
 isEmpty(COPIES): return()
 contains(TEMPLATE, .*subdirs): error("COPIES does not work with TEMPLATE=subdirs")
 
-build_pass:build_all: \
-  debug_and_release:debug {
+build_pass:build_all:!isEqual(BUILD_PASS, $$first(BUILDS)) {
     # Avoid that multiple build passes race with each other.
     # This will fail to copy anything if the user explicitly invokes
     # only the non-primary build. This is unfixable, as at qmake time

mkspecs/features/qt.prf

@@ -156,7 +156,7 @@ for(ever) {
     !isEmpty(var_sfx): break()
     var_sfx = _PRIVATE
 }
-!isEmpty(using_privates):!no_private_qt_headers_warning:if(!debug_and_release|!build_pass) {
+!isEmpty(using_privates):!no_private_qt_headers_warning:!build_pass {
     message("This project is using private headers and will therefore be tied to this specific Qt module build version.")
     message("Running this project against other versions of the Qt modules may crash at any arbitrary point.")
     message("This is not a bug, but a result of using Qt internals. You have been warned!")

mkspecs/features/qt_docs_targets.prf

@@ -30,7 +30,7 @@ contains(TEMPLATE, subdirs) {
     for(inst, DOC_TARGETS): \
         prepareRecursiveTarget($$inst)
 } else {
-    debug_and_release:!build_pass {
+    !isEmpty(BUILDS):!build_pass {
         sub = $$first(BUILDS)
         for(inst, DOC_TARGETS) {
             $${inst}.CONFIG = recursive

mkspecs/features/qt_functions.prf

@@ -259,7 +259,10 @@ defineReplace(pkgConfigExecutable) {
 }
 
 defineTest(packagesExist) {
-    contains(QT_CONFIG, no-pkg-config):return(false)
+    contains(QT_CONFIG, no-pkg-config) {
+        warning("pkg-config disabled, can't check package existence")
+        return(false)
+    }
 
     # this can't be done in global scope here because qt_functions is loaded
     # before the .pro is parsed, so if the .pro set PKG_CONFIG, we wouldn't know it

mkspecs/features/resources.prf

@@ -35,7 +35,7 @@ for(resource, RESOURCES) {
 
     resource_file = $$RCC_DIR/qmake_$${resource}.qrc
 
-    !debug_and_release|build_pass {
+    isEmpty(BUILDS)|build_pass {
         # Collection of files, generate qrc file
         prefix = $$eval($${resource}.prefix)
         isEmpty(prefix): \

mkspecs/openbsd-g++/qmake.conf

@@ -17,9 +17,26 @@ QMAKE_LIBDIR_X11        = /usr/X11R6/lib
 QMAKE_INCDIR_OPENGL     = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL     = /usr/X11R6/lib
 
+QMAKE_RPATHDIR         += $$QMAKE_LIBDIR_X11
+
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
 
+# System compiler is gcc 4.2.1 up to OpenBSD 6.0.
+# For proper C++11 support, we need to use a newer gcc from ports/packages,
+# where compiler commands are renamed to egcc/eg++. Therefore, redefine
+# mkspecs/common/g++-base.conf compiler commands
+QMAKE_CC                = egcc
+
+QMAKE_LINK_C            = $$QMAKE_CC
+QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
+
+QMAKE_CXX               = eg++
+
+QMAKE_LINK              = $$QMAKE_CXX
+QMAKE_LINK_SHLIB        = $$QMAKE_CXX
+
+
 # Reset g++-unix.conf's NOUNDEF flags as OpenBSD libc can't handle environ
 QMAKE_LFLAGS_NOUNDEF    =
 

qmake/library/qmakebuiltins.cpp

@@ -1037,7 +1037,11 @@ ProStringList QMakeEvaluator::evaluateBuiltinExpand(
             QString rstr = QDir::cleanPath(
                     QDir(args.count() > 1 ? args.at(1).toQString(m_tmp2) : currentDirectory())
                     .absoluteFilePath(args.at(0).toQString(m_tmp1)));
-            ret << (rstr.isSharedWith(m_tmp1) ? args.at(0) : ProString(rstr).setSource(args.at(0)));
+            ret << (rstr.isSharedWith(m_tmp1)
+                        ? args.at(0)
+                        : args.count() > 1 && rstr.isSharedWith(m_tmp2)
+                            ? args.at(1)
+                            : ProString(rstr).setSource(args.at(0)));
         }
         break;
     case E_RELATIVE_PATH:
@@ -1211,7 +1215,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
         return ReturnFalse;
     case T_REQUIRES:
 #ifdef PROEVALUATOR_FULL
-        checkRequirements(args);
+        if (checkRequirements(args) == ReturnError)
+            return ReturnError;
 #endif
         return ReturnFalse; // Another qmake breakage
     case T_EVAL: {
@@ -1232,8 +1237,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
             evalError(fL1S("if(condition) requires one argument."));
             return ReturnFalse;
         }
-        return returnBool(evaluateConditional(args.at(0).toQString(),
-                                              m_current.pro->fileName(), m_current.line));
+        return evaluateConditional(args.at(0).toQString(),
+                                   m_current.pro->fileName(), m_current.line);
     }
     case T_CONFIG: {
         if (args.count() < 1 || args.count() > 2) {