Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp

Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7

22 files changed, 26 insertions, 90 deletions

diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index 384c013309..fd10785079 100644
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -38,7 +38,8 @@ QMAKE_LIBS_LIBUDEV    = -ludev
 
 QMAKE_CFLAGS_WAYLAND =
 QMAKE_INCDIR_WAYLAND =
-QMAKE_LIBS_WAYLAND =
+QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client
+QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server
 QMAKE_LIBDIR_WAYLAND =
 QMAKE_DEFINES_WAYLAND =
 QMAKE_WAYLAND_SCANNER = wayland-scanner
diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf
index 2bc33117bb..11e8ca43a2 100644
--- a/mkspecs/common/qcc-base-qnx.conf
+++ b/mkspecs/common/qcc-base-qnx.conf
@@ -41,9 +41,6 @@ QMAKE_LFLAGS            = -Wl,-rpath-link,$${QNX_DIR}/$${QNX_CPUDIR}/lib -Wl,-rp
 
 QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]
 QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
-QMAKE_MOC               = $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC               = $$[QT_INSTALL_BINS]/uic
-QMAKE_RCC               = $$[QT_INSTALL_BINS]/rcc
 
 QMAKE_CXX               = $$QMAKE_CC -lang-c++
 
diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf
index 57b89b9650..6b7a2d71fe 100644
--- a/mkspecs/common/wince/qmake.conf
+++ b/mkspecs/common/wince/qmake.conf
@@ -70,10 +70,6 @@ QMAKE_LIBS_OPENGL_ES2 = libGLESv2.lib
 
 QMAKE_LIBS_QT_ENTRY	= -lqtmain
 
-QMAKE_MOC		= $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC		= $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC		= $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL		= midl
 QMAKE_LIB		= lib
 QMAKE_RC		= rc
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
index 5d8684bf00..c3776c4da5 100644
--- a/mkspecs/features/default_pre.prf
+++ b/mkspecs/features/default_pre.prf
@@ -48,7 +48,7 @@ CONFIG = lex yacc warn_on debug uic resources $$CONFIG
     }
 
     # Let qmake know about the unexpectedly appearing cache file.
-    contains(QTFWD, -cache-module-fwd):_QMAKE_CACHE_ = $$QMAKE_SYNCQT_OUTDIR/.qmake.cache
+    exists($$QMAKE_SYNCQT_OUTDIR/.qmake.cache):_QMAKE_CACHE_ = $$QMAKE_SYNCQT_OUTDIR/.qmake.cache
 
     unset(QTFWD)
     unset(PRO_BASENAME)
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 3f155a2d6b..94f8100f88 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -97,12 +97,6 @@ equals(MOC_DIR, .) {
 unix:!no_mocdepend {
      moc_source.depends += $$first(QMAKE_MOC)
      moc_header.depends += $$first(QMAKE_MOC)
-     !contains(TARGET, moc) { #auto build moc
-         isEmpty(QMAKE_MOC_SRC):QMAKE_MOC_SRC = "$(QTDIR)/src/tools/moc"
-    	 make_moc.target = $$first(QMAKE_MOC)
-	     make_moc.commands = (cd $$QMAKE_MOC_SRC && $(MAKE))
-	     QMAKE_EXTRA_TARGETS += make_moc
-     }
 }
 
 #generate a mocclean
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 21443aa5b5..f71afbb04e 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -168,12 +168,13 @@ for(QTLIB, QT) {
 QT = $$resolve_depends(NEWQT, "QT.")
 # Finally actually add the modules
 for(QTLIB, QT) {
-    isEmpty(QT.$${QTLIB}.name) {
+    QTLIBNAME = $$eval(QT.$${QTLIB}.name)
+    isEmpty(QTLIBNAME) {
         message("Warning: unknown QT module: $$QTLIB")
         next()
     }
 
-    target_qt:isEqual(TARGET, QTLIB) {
+    target_qt:isEqual(TARGET, $$QTLIBNAME) {
         warning($$TARGET cannot have a QT of $$QTLIB)
         next()
     }
@@ -189,7 +190,7 @@ for(QTLIB, QT) {
 
 qt_compat {
    !qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us
-   INCLUDEPATH *= $$QMAKE_INCDIR_QT/Qt
+   INCLUDEPATH *= $$QT.core.includes
    DEFINES *= QT_COMPAT
 }
 
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 31b28156e8..474a414003 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -132,9 +132,11 @@ defineTest(qtAddModule) {
 
     isEmpty(LINKAGE) {
        # Make sure we can link to uninstalled libraries
-       !isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) { ### XXX
-           QMAKE_LIBDIR *= $$MODULE_LIBS
-           unix:!mac:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS"
+       !isEmpty(MODULE_LIBS) {
+           !isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) { ### XXX
+               QMAKE_LIBDIR *= $$MODULE_LIBS
+               unix:!mac:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS"
+           }
        }
        if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
            win32:LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}d
@@ -146,7 +148,7 @@ defineTest(qtAddModule) {
     # to give access to sources or include files, and not for linking.
     !isEmpty(MODULE_LIBS) {
         !isEmpty(QMAKE_LSB) {
-            QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT
+            QMAKE_LFLAGS *= --lsb-libpath=$$MODULE_LIBS
             QMAKE_LFLAGS *= -L/opt/lsb/lib
             QMAKE_LFLAGS *= --lsb-shared-libs=$${MODULE_NAME}$${QT_LIBINFIX}
         }
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index 98cdab121f..cae5f47387 100644
--- a/mkspecs/features/qt_module_config.prf
+++ b/mkspecs/features/qt_module_config.prf
@@ -118,24 +118,24 @@ load(qt_installs)
 
 unix|win32-g++* {
    CONFIG += create_pc
-   QMAKE_PKGCONFIG_LIBDIR = $$[QT_RAW_INSTALL_LIBS]
-   QMAKE_PKGCONFIG_INCDIR = $$[QT_RAW_INSTALL_HEADERS]/$$TARGET
-   QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_RAW_INSTALL_HEADERS]
+   QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw]
+   QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]/$$TARGET
+   QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS/raw]
    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
    include_replace.match = $$QMAKE_INCDIR_QT
-   include_replace.replace = $$[QT_RAW_INSTALL_HEADERS]
+   include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
    lib_replace.match = $$QMAKE_LIBDIR_QT
-   lib_replace.replace = $$[QT_RAW_INSTALL_LIBS]
+   lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
    prefix_replace.match = $$QT_BUILD_TREE
-   prefix_replace.replace = $$[QT_RAW_INSTALL_PREFIX]
+   prefix_replace.replace = $$[QT_INSTALL_PREFIX/raw]
    QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace
 }
 
 unix {
    CONFIG += create_libtool explicitlib
-   QMAKE_PRL_LIBDIR = $$[QT_RAW_INSTALL_LIBS] ### XXX
+   QMAKE_PRL_LIBDIR = $$[QT_INSTALL_LIBS/raw] ### XXX
    QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
-   QMAKE_LIBTOOL_LIBDIR = $$[QT_RAW_INSTALL_LIBS]
+   QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw]
    QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
 }
 
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf
index 9bb9875f6d..b00d15579f 100644
--- a/mkspecs/features/testcase.prf
+++ b/mkspecs/features/testcase.prf
@@ -97,7 +97,11 @@ contains(INSTALLS, target) {
     #   ...
     #
     for(file, TESTDATA) {
-        tdi = testdata_install_$${file}
+        tnam = $$file
+        tnam ~= s,\\.\\.,dotdot,
+        tnam ~= s,[?*],wildcard,
+        tnam ~= s,[^A-Za-z0-9],_,
+        tdi = testdata_$$tnam
         tdif = $${tdi}.files
         tdip = $${tdi}.path
 
diff --git a/mkspecs/features/win32/dumpcpp.prf b/mkspecs/features/win32/dumpcpp.prf
deleted file mode 100644
index 19637998c7..0000000000
--- a/mkspecs/features/win32/dumpcpp.prf
+++ /dev/null
@@ -1,11 +0,0 @@
-isEmpty(QMAKE_DUMPCPP_NAME) {
-    QMAKE_DUMPCPP_NAME = make_dumpcpp
-}
-
-# auto depend on dumpcpp
-!contains(TARGET, dumpcpp) {
-    isEmpty(QMAKE_DUMPCPP_SRC): QMAKE_DUMPCPP_SRC = "$(QTDIR)/tools/activeqt/dumpcpp"
-    make_dumpcpp.commands = (cd $$QMAKE_DUMPCPP_SRC && $(QMAKE) && $(MAKE))
-    QMAKE_EXTRA_TARGETS += $$QMAKE_DUMPCPP_NAME
-}
-
diff --git a/mkspecs/unsupported/qws/qnx-641/qmake.conf b/mkspecs/unsupported/qws/qnx-641/qmake.conf
index 441f408802..0636ca7347 100644
--- a/mkspecs/unsupported/qws/qnx-641/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-641/qmake.conf
@@ -75,9 +75,6 @@ QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_THREAD       =
 QMAKE_LIBS_NETWORK      += -lsocket
 QMAKE_LIBS_GUI          += -lsocket
-QMAKE_MOC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
-QMAKE_UIC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
-QMAKE_IDC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
 
 QMAKE_AR		= ntox86-ar cqs
 QMAKE_RANLIB		=
diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
index bb760b24a7..608da6948e 100644
--- a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
@@ -78,9 +78,6 @@ QMAKE_LIBS_THREAD	=
 QMAKE_LIBS_NETWORK      += -lsocket
 QMAKE_LIBS_GUI          += -lsocket
 
-QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic
-
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
diff --git a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
index b43c39143f..395f4fe3bf 100644
--- a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
@@ -74,9 +74,6 @@ QMAKE_LIBS_THREAD	=
 QMAKE_LIBS_NETWORK      += -lsocket
 QMAKE_LIBS_GUI          += -lsocket
 
-QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic
-
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
diff --git a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
index 29a2952989..433b09161f 100644
--- a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
@@ -74,9 +74,6 @@ QMAKE_LIBS_THREAD	=
 QMAKE_LIBS_NETWORK      += -lsocket
 QMAKE_LIBS_GUI          += -lsocket
 
-QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic
-
 QMAKE_AR		= ar cqs
 QMAKE_RANLIB		=
 
diff --git a/mkspecs/unsupported/win32-borland/qmake.conf b/mkspecs/unsupported/win32-borland/qmake.conf
index 2ba742c104..c1aa7e46ad 100644
--- a/mkspecs/unsupported/win32-borland/qmake.conf
+++ b/mkspecs/unsupported/win32-borland/qmake.conf
@@ -69,10 +69,6 @@ QMAKE_LIBS_QT_ENTRY	= -lqtmain
 #QMAKE_LIBS_OPENGL	=
 #QMAKE_LFLAGS_OPENGL	= /dopengl32.dll
 
-QMAKE_MOC		= $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC		= $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC		= $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL		= midl
 QMAKE_LIB		= tlib /C /P256
 QMAKE_RC		= brcc32 -dQ_CC_BOR
diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf
index 9dcff807fa..9c85c9033c 100644
--- a/mkspecs/unsupported/win32-g++-cross/qmake.conf
+++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf
@@ -65,7 +65,6 @@ QMAKE_LINK_OBJECT_SCRIPT= object_script
 QMAKE_PREFIX_STATICLIB  = lib
 QMAKE_EXTENSION_STATICLIB = a
 
-
 QMAKE_LIBS		=
 QMAKE_LIBS_CORE         = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
 QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32
@@ -88,12 +87,6 @@ QMAKE_DEL_DIR		= rmdir
 QMAKE_SYMBOLIC_LINK	= ln -s
 QMAKE_CHK_DIR_EXISTS	= test -d
 
-#QMAKE_IDC		= i686-pc-mingw32-idc
-QMAKE_MOC		= i686-pc-mingw32-moc
-QMAKE_RCC		= i686-pc-mingw32-rcc
-QMAKE_UIC		= i686-pc-mingw32-uic
-
-#QMAKE_IDL		= midl
 QMAKE_LIB		= i686-pc-mingw32-ar -ru
 QMAKE_RC		= i686-pc-mingw32-windres
 QMAKE_ZIP		= zip -r -9
diff --git a/mkspecs/unsupported/win32-msvc2003/qmake.conf b/mkspecs/unsupported/win32-msvc2003/qmake.conf
index a573a4dd8c..29681c1034 100644
--- a/mkspecs/unsupported/win32-msvc2003/qmake.conf
+++ b/mkspecs/unsupported/win32-msvc2003/qmake.conf
@@ -67,10 +67,6 @@ QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32
 
 QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 641e4109ff..7a04a51932 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -65,7 +65,6 @@ QMAKE_LINK_OBJECT_SCRIPT= object_script
 QMAKE_PREFIX_STATICLIB  = lib
 QMAKE_EXTENSION_STATICLIB = a
 
-
 QMAKE_LIBS		=
 QMAKE_LIBS_CORE         = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
 QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32
@@ -96,10 +95,6 @@ QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
     QMAKE_CHK_DIR_EXISTS	= if not exist
 }
 
-QMAKE_MOC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
-QMAKE_UIC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
-QMAKE_IDC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
-
 QMAKE_IDL		= midl
 QMAKE_LIB		= ar -ru
 QMAKE_RC		= windres
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index 2dd796d7ea..8a7260aca0 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -67,10 +67,6 @@ QMAKE_LIBS_OPENGL       = glu32.lib opengl32.lib gdi32.lib user32.lib delayimp.l
 QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib
 QMAKE_LIBS_QT_ENTRY	= -lqtmain
 
-QMAKE_MOC		= $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC		= $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC		= $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL		= midl
 QMAKE_LIB		= xilib /NOLOGO
 QMAKE_RC		= rc
diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index d4b9521b6d..66f10236c0 100644
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ b/mkspecs/win32-msvc2005/qmake.conf
@@ -71,10 +71,6 @@ QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32
 
 QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc
diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 00fafc7872..e360165ce3 100644
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -73,10 +73,6 @@ QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32
 
 QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index b53ff1a478..99645a0a96 100644
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -73,10 +73,6 @@ QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32
 
 QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
-QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
-QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
-
 QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
 QMAKE_RC                = rc