5 files changed, 74 insertions, 63 deletions
diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf
index 2f66909bb4..118eed1e94 100644
--- a/mkspecs/features/ctest_testcase_common.prf
+++ b/mkspecs/features/ctest_testcase_common.prf
@@ -83,6 +83,8 @@ CMAKE_MODULES_UNDER_TEST = $$join(CMAKE_MODULES_UNDER_TEST, ;)
 check.commands = \
     $(MKDIR) $$BUILD_DIR && cd $$BUILD_DIR && \
     cmake $$CMAKE_TEST_LOCATION $$CMAKE_GENERATOR \
+        -DCMAKE_C_COMPILER=$$QMAKE_CC \
+        -DCMAKE_CXX_COMPILER=$$QMAKE_CXX \
         -DCMAKE_VERBOSE_MAKEFILE=1 \
         $$CMAKE_MODULE_DEFINES \
         $$CMAKE_GL_DEFINES \
diff --git a/mkspecs/features/ctest_testcase_installed.prf b/mkspecs/features/ctest_testcase_installed.prf
index be741b4a0b..b54f321008 100644
--- a/mkspecs/features/ctest_testcase_installed.prf
+++ b/mkspecs/features/ctest_testcase_installed.prf
@@ -1,8 +1,10 @@
 
-CMAKE_TEST_LOCATION = $$_PRO_FILE_PWD_/../cmake
+prefix_build {
+    CMAKE_TEST_LOCATION = $$_PRO_FILE_PWD_/../cmake
 
-CMAKE_PREFIX_PATH = $$[QT_INSTALL_PREFIX]
+    CMAKE_PREFIX_PATH = $$[QT_INSTALL_PREFIX]
 
-CONFIG += insignificant_test
+    CONFIG += insignificant_test
 
-include(ctest_testcase_common.prf)
+    include(ctest_testcase_common.prf)
+}
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index 38623349be..bcff3166d3 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -119,14 +119,21 @@ 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}
-!!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-                 ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS}
-!!ENDIF
-                 )
+    foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
         _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${_dir})
     endforeach()
 
+!!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
+    # Only check existence of private includes if the Private component is
+    # specified.
+    list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private)
+    if (NOT _check_private STREQUAL -1)
+        foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
+            _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${_dir})
+        endforeach()
+    endif()
+!!ENDIF
+
     set(Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
 
     set(Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -D$${MODULE_DEFINE})
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 7f7de85bb6..390fb49930 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -90,7 +90,7 @@ else: \
 # OS X and iOS frameworks
 mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
    #QMAKE_FRAMEWORK_VERSION = 4.0
-   CONFIG += lib_bundle qt_framework
+   CONFIG += lib_bundle sliced_bundle qt_framework
    !debug_and_release|if(build_all:CONFIG(release, debug|release)) {
         FRAMEWORK_HEADERS.version = Versions
         FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
index 2ec064f29d..b2eca41695 100644
--- a/mkspecs/features/wayland-scanner.prf
+++ b/mkspecs/features/wayland-scanner.prf
@@ -5,64 +5,64 @@
 
 isEmpty(QMAKE_WAYLAND_SCANNER):error("QMAKE_WAYLAND_SCANNER not defined for this mkspec")
 
-wayland-server-header.name = wayland ${QMAKE_FILE_BASE}
-wayland-server-header.input = WAYLANDSERVERSOURCES
-wayland-server-header.variable_out = HEADERS
-wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
-wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
-QMAKE_EXTRA_COMPILERS += wayland-server-header
+wayland_server_header.name = wayland ${QMAKE_FILE_BASE}
+wayland_server_header.input = WAYLANDSERVERSOURCES
+wayland_server_header.variable_out = HEADERS
+wayland_server_header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
+wayland_server_header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+silent:wayland_server_header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland_server_header.commands
+QMAKE_EXTRA_COMPILERS += wayland_server_header
 
-wayland-client-header.name = wayland ${QMAKE_FILE_BASE}
-wayland-client-header.input = WAYLANDCLIENTSOURCES
-wayland-client-header.variable_out = HEADERS
-wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
-wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
-QMAKE_EXTRA_COMPILERS += wayland-client-header
+wayland_client_header.name = wayland ${QMAKE_FILE_BASE}
+wayland_client_header.input = WAYLANDCLIENTSOURCES
+wayland_client_header.variable_out = HEADERS
+wayland_client_header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
+wayland_client_header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+silent:wayland_client_header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland_client_header.commands
+QMAKE_EXTRA_COMPILERS += wayland_client_header
 
-wayland-code.name = wayland ${QMAKE_FILE_BASE}
-wayland-code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES
-wayland-code.variable_out = SOURCES
-wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c
-wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
-QMAKE_EXTRA_COMPILERS += wayland-code
+wayland_code.name = wayland ${QMAKE_FILE_BASE}
+wayland_code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES
+wayland_code.variable_out = SOURCES
+wayland_code.output = wayland-${QMAKE_FILE_BASE}-protocol.c
+wayland_code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+silent:wayland_code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland_code.commands
+QMAKE_EXTRA_COMPILERS += wayland_code
 
 qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner)
 
-qtwayland-client-header.name = qtwayland ${QMAKE_FILE_BASE}
-qtwayland-client-header.input = WAYLANDCLIENTSOURCES
-qtwayland-client-header.variable_out = HEADERS
-qtwayland-client-header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
-qtwayland-client-header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
-qtwayland-client-header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands
-QMAKE_EXTRA_COMPILERS += qtwayland-client-header
+qtwayland_client_header.name = qtwayland ${QMAKE_FILE_BASE}
+qtwayland_client_header.input = WAYLANDCLIENTSOURCES
+qtwayland_client_header.variable_out = HEADERS
+qtwayland_client_header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
+qtwayland_client_header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
+qtwayland_client_header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+silent:qtwayland_client_header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland_client_header.commands
+QMAKE_EXTRA_COMPILERS += qtwayland_client_header
 
-qtwayland-client-code.name = qtwayland ${QMAKE_FILE_BASE}
-qtwayland-client-code.input = WAYLANDCLIENTSOURCES
-qtwayland-client-code.variable_out = SOURCES
-qtwayland-client-code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
-qtwayland-client-code.output = qwayland-${QMAKE_FILE_BASE}.cpp
-qtwayland-client-code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands
-QMAKE_EXTRA_COMPILERS += qtwayland-client-code
+qtwayland_client_code.name = qtwayland ${QMAKE_FILE_BASE}
+qtwayland_client_code.input = WAYLANDCLIENTSOURCES
+qtwayland_client_code.variable_out = SOURCES
+qtwayland_client_code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
+qtwayland_client_code.output = qwayland-${QMAKE_FILE_BASE}.cpp
+qtwayland_client_code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+silent:qtwayland_client_code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland_client_code.commands
+QMAKE_EXTRA_COMPILERS += qtwayland_client_code
 
-qtwayland-server-header.name = qtwayland ${QMAKE_FILE_BASE}
-qtwayland-server-header.input = WAYLANDSERVERSOURCES
-qtwayland-server-header.variable_out = HEADERS
-qtwayland-server-header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
-qtwayland-server-header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
-qtwayland-server-header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands
-QMAKE_EXTRA_COMPILERS += qtwayland-server-header
+qtwayland_server_header.name = qtwayland ${QMAKE_FILE_BASE}
+qtwayland_server_header.input = WAYLANDSERVERSOURCES
+qtwayland_server_header.variable_out = HEADERS
+qtwayland_server_header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
+qtwayland_server_header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
+qtwayland_server_header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+silent:qtwayland_server_header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland_server_header.commands
+QMAKE_EXTRA_COMPILERS += qtwayland_server_header
 
-qtwayland-server-code.name = qtwayland ${QMAKE_FILE_BASE}
-qtwayland-server-code.input = WAYLANDSERVERSOURCES
-qtwayland-server-code.variable_out = SOURCES
-qtwayland-server-code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
-qtwayland-server-code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp
-qtwayland-server-code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands
-QMAKE_EXTRA_COMPILERS += qtwayland-server-code
+qtwayland_server_code.name = qtwayland ${QMAKE_FILE_BASE}
+qtwayland_server_code.input = WAYLANDSERVERSOURCES
+qtwayland_server_code.variable_out = SOURCES
+qtwayland_server_code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
+qtwayland_server_code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp
+qtwayland_server_code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+silent:qtwayland_server_code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland_server_code.commands
+QMAKE_EXTRA_COMPILERS += qtwayland_server_code