Merge branch 'master' into stable

Change-Id: I5c0c9a131cca64fea3bc784339d14d84076edc1a

6 files changed, 16 insertions, 20 deletions

diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 6f3f318e0a..5359953d90 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -47,12 +47,3 @@ breakpad {
 
 QMAKE_INCDIR += $$QMAKE_INCDIR_POST
 QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST
-
-# Let every project have a standard GNU `check' target
-!contains(QMAKE_EXTRA_TARGETS, check) {
-    contains(TEMPLATE, subdirs): \
-        prepareRecursiveTarget(check)
-    else: \
-        check.depends = first # `make check' implies build
-    QMAKE_EXTRA_TARGETS += check
-}
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index 63d6b43c7c..29dd354a31 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -27,8 +27,8 @@ mac {
 
 CONFIG += \
     create_prl link_prl \
+    testcase_targets \
     prepare_docs qt_docs_targets \
-    qt_example_installs \
     no_private_qt_headers_warning QTDIR_build \
     # Qt modules get compiled without exceptions enabled by default.
     # However, testcases should be still built with exceptions.
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
index 72f0b141a7..281552acb6 100644
--- a/mkspecs/features/qt_example_installs.prf
+++ b/mkspecs/features/qt_example_installs.prf
@@ -21,6 +21,7 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
     extras = \
         $$_PRO_FILE_PWD_/README \
         $$files($$_PRO_FILE_PWD_/*.pri) \
+        $$replace(_PRO_FILE_, \\.pro$, .qmlproject) \
         $$replace(_PRO_FILE_, \\.pro$, .json) \
         $$replace(_PRO_FILE_, \\.pro$, .inf)
     for(extra, extras): \
@@ -30,6 +31,10 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
     # Just for Qt Creator
     OTHER_FILES += $$sourcefiles
 
+    for(inst, INSTALLS): \
+        !equals(inst, target):!contains($${inst}.CONFIG, no_check_exist): \
+            for(file, $${inst}.files): \
+                sourcefiles += $$files($$absolute_path($$file, $$_PRO_FILE_PWD_))
     sourcefiles += \
         $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \
         $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index eb46481c70..0b6ad86ae1 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -35,14 +35,6 @@ else: \
 MODULE_DEFINES = $$MODULE_DEFINE $$MODULE_DEFINES
 
 load(qt_build_paths)
-
-# This check will be removed soon. Weird indentation to avoid reindenting the code later.
-!isEmpty(MODULE_PRI) {
-    !build_pass:warning("$$_PRO_FILE_ still sets MODULE_PRI. Not auto-generating module .pri file.")
-    MODULE_PRI = $$absolute_path($$MODULE_PRI, $$_PRO_FILE_PWD_)
-    exists($$MODULE_PRI)|error("Specified module pri file $$MODULE_PRI does not exist.")
-} else {
-
 MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri
 
 !build_pass {
@@ -97,8 +89,6 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri
 
 } # !build_pass
 
-} # isEmpty(MODULE_PRI)
-
 load(qt_module_fwdpri)
 
 INCLUDEPATH *= $$eval(QT.$${MODULE}.includes) $$eval(QT.$${MODULE}.private_includes)
diff --git a/mkspecs/features/qt_module_fwdpri.prf b/mkspecs/features/qt_module_fwdpri.prf
index b7270aea59..0b203b5a90 100644
--- a/mkspecs/features/qt_module_fwdpri.prf
+++ b/mkspecs/features/qt_module_fwdpri.prf
@@ -72,6 +72,7 @@
     for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \
                     name depends private_depends module_config CONFIG DEFINES sources \
                     includes private_includes bins libs libexecs plugins imports qml \
+                    rpath_link rpath_link_private \
             )):defined(QT.$${MODULE}.$$var, var):cache(QT.$${MODULE}.$$var, transient)
     cache(QT_CONFIG, transient)
 
diff --git a/mkspecs/features/testcase_targets.prf b/mkspecs/features/testcase_targets.prf
new file mode 100644
index 0000000000..e9b107735a
--- /dev/null
+++ b/mkspecs/features/testcase_targets.prf
@@ -0,0 +1,9 @@
+
+# Let every project have a standard GNU `check' target
+!contains(QMAKE_EXTRA_TARGETS, check) {
+    contains(TEMPLATE, subdirs): \
+        prepareRecursiveTarget(check)
+    else: \
+        check.depends = first # `make check' implies build
+    QMAKE_EXTRA_TARGETS += check
+}