5 files changed, 51 insertions, 21 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
index adcdbb73e9..d451d29f7c 100644
--- a/mkspecs/features/default_pre.prf
+++ b/mkspecs/features/default_pre.prf
@@ -26,7 +26,11 @@ exists($$_PRO_FILE_PWD_/sync.profile) {
 
     message("Running syncqt for $$PRO_BASENAME in $$OUT_PWD")
     qtPrepareTool(QMAKE_SYNCQT, syncqt)
-    system("$$QMAKE_SYNCQT $$QTFWD -outdir $$OUT_PWD $$_PRO_FILE_PWD_")
+    system("$$QMAKE_SYNCQT $$QTFWD -outdir $$OUT_PWD $$_PRO_FILE_PWD_") {
+        # success! Nothing to do
+    } else {
+        error("Failed to run: $$QMAKE_SYNCQT $$QTFWD -outdir $$OUT_PWD $$_PRO_FILE_PWD_")
+    }
     unset(QTFWD)
     unset(PRO_BASENAME)
 }
diff --git a/mkspecs/features/designer.prf b/mkspecs/features/designer.prf
index 63a7e76a34..843a118a9a 100644
--- a/mkspecs/features/designer.prf
+++ b/mkspecs/features/designer.prf
@@ -1,7 +1,6 @@
-QT += xml
-contains(QT_CONFIG, script): QT += script
+QT += xml uilib
+!isEmpty(QT.script.name): QT += script
+!isEmpty(QT.designer.name): QT += designer
 qt:load(qt)
 
 plugin:DEFINES += QDESIGNER_EXPORT_WIDGETS
-
-qtAddLibrary(QtDesigner, true)
diff --git a/mkspecs/features/qmltestcase.prf b/mkspecs/features/qmltestcase.prf
index a3d66e659e..5e60185493 100644
--- a/mkspecs/features/qmltestcase.prf
+++ b/mkspecs/features/qmltestcase.prf
@@ -1,20 +1,6 @@
 CONFIG += testcase
 
-!symbian {
-    INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtQuickTest
-} else {
-    load(data_caging_paths)
-
-    INCLUDEPATH+=$$MW_LAYER_PUBLIC_EXPORT_PATH(QtQuickTest)
-}
-
-QT += declarative
-
-win32:CONFIG(debug, debug|release) {
-    LIBS += -lQtQuickTest$${QT_LIBINFIX}d
-} else {
-    LIBS += -lQtQuickTest$${QT_LIBINFIX}
-}
+QT += declarative qmltest
 
 # If the .pro file specified an IMPORTPATH, then add that to
 # the command-line when the test is run.
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index c611096147..3791c9565a 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -160,7 +160,7 @@ for(QTLIB, $$list($$lower($$unique(QT)))) {
 
 # add include paths for all .depends, since module/application might need f.ex. template specializations etc.
 QT_DEPENDS -= $$QT
-for(QTLIB, $$list($$lower($$unique(QT_DEPENDS)))):INCLUDEPATH += $$INCLUDEPATH $$eval(QT.$${QTLIB}.includes)
+for(QTLIB, $$list($$lower($$unique(QT_DEPENDS)))):INCLUDEPATH *= $$INCLUDEPATH $$eval(QT.$${QTLIB}.includes)
 
 !isEmpty(using_privates):!no_private_qt_headers_warning:if(!debug_and_release|!build_pass) {
     message("This project is using private headers and will therefore be tied to this specific Qt module build version.")
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
new file mode 100644
index 0000000000..c4eaab8147
--- /dev/null
+++ b/mkspecs/features/qt_plugin.prf
@@ -0,0 +1,41 @@
+TEMPLATE = lib
+isEmpty(QT_MAJOR_VERSION) {
+   VERSION=5.0.0
+} else {
+   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+}
+CONFIG += qt plugin
+
+win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
+TARGET = $$qtLibraryTarget($$TARGET)
+contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+
+load(qt_targets)
+
+wince*:LIBS += $$QMAKE_LIBS_GUI
+
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+    TARGET.CAPABILITY = All -Tcb
+    TARGET = $${TARGET}$${QT_LIBINFIX}
+    load(armcc_warnings)
+
+    # Make partial upgrade SIS file for Qt plugin dll's
+    # Partial upgrade SIS file
+    vendorinfo = \
+        "; Localised Vendor name" \
+        "%{\"Nokia\"}" \
+        " " \
+        "; Unique Vendor name" \
+        ":\"Nokia, Qt\"" \
+        " "
+    isEmpty(QT_LIBINFIX): PARTIAL_UPGRADE_UID = 0x2001E61C
+    else: PARTIAL_UPGRADE_UID = 0xE001E61C
+
+    pu_header = "; Partial upgrade package for testing $${TARGET} changes without reinstalling everything" \
+                "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$PARTIAL_UPGRADE_UID), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU"
+    partial_upgrade.pkg_prerules = pu_header vendorinfo
+    partial_upgrade.files = $$QMAKE_LIBDIR_QT/$${TARGET}.dll
+    partial_upgrade.path = c:/sys/bin
+    DEPLOYMENT += partial_upgrade
+}