Merge "Merge branch 'buildsystem'" into refs/staging/master

27 files changed, 60 insertions, 182 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index d3d2f5520f..5af19010c7 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,11 @@
 TEMPLATE = subdirs
-SUBDIRS += demos shared localstorage particles qml quick tutorials window
-contains(QT_CONFIG, qmltest): SUBDIRS += qmltest
+SUBDIRS += \
+    demos \
+    shared \
+    localstorage \
+    particles \
+    qml \
+    quick \
+    tutorials \
+    window \
+    qmltest
diff --git a/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.pro
index f786d9356f..cde1d2f83c 100644
--- a/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.pro
+++ b/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.pro
@@ -1,7 +1,4 @@
-TEMPLATE = app
 TARGET = abstractitemmodel
-DEPENDPATH += .
-INCLUDEPATH += .
 QT += qml quick
 
 HEADERS = model.h
diff --git a/modules/qt_qml.pri b/modules/qt_qml.pri
deleted file mode 100644
index 3dc3acac40..0000000000
--- a/modules/qt_qml.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.qml.VERSION = 5.0.0
-QT.qml.MAJOR_VERSION = 5
-QT.qml.MINOR_VERSION = 0
-QT.qml.PATCH_VERSION = 0
-
-QT.qml.name = QtQml
-QT.qml.bins = $$QT_MODULE_BIN_BASE
-QT.qml.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQml
-QT.qml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQml/$$QT.qml.VERSION
-QT.qml.sources = $$QT_MODULE_BASE/src/qml
-QT.qml.libs = $$QT_MODULE_LIB_BASE
-QT.qml.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.qml.imports = $$QT_MODULE_IMPORT_BASE
-QT.qml.depends = network
-QT.qml.DEFINES = QT_QML_LIB QQmlImageProvider=QQuickImageProvider
-
-QT_CONFIG += qml
diff --git a/modules/qt_qmldevtools.pri b/modules/qt_qmldevtools.pri
deleted file mode 100644
index 7365f13404..0000000000
--- a/modules/qt_qmldevtools.pri
+++ /dev/null
@@ -1,19 +0,0 @@
-QT.qmldevtools.VERSION = 5.0.0
-QT.qmldevtools.MAJOR_VERSION = 5
-QT.qmldevtools.MINOR_VERSION = 0
-QT.qmldevtools.PATCH_VERSION = 0
-
-QT.qmldevtools.name = QtQmlDevTools
-QT.qmldevtools.bins = $$QT_MODULE_BIN_BASE
-QT.qmldevtools.includes = $$QT_MODULE_INCLUDE_BASE/QtQmlDevTools
-QT.qmldevtools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQmlDevTools/$$QT.qmldevtools.VERSION
-QT.qmldevtools.sources = $$QT_MODULE_BASE/src/qmldevtools
-QT.qmldevtools.libs = $$QT_MODULE_LIB_BASE
-QT.qmldevtools.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.qmldevtools.imports = $$QT_MODULE_IMPORT_BASE
-QT.qmldevtools.depends = core
-QT.qmldevtools.module_config = staticlib
-QT.qmldevtools.DEFINES = QT_QMLDEVTOOLS_LIB
-
-QT_CONFIG += qmldevtools
-
diff --git a/modules/qt_qmltest.pri b/modules/qt_qmltest.pri
deleted file mode 100644
index e3d747f700..0000000000
--- a/modules/qt_qmltest.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.qmltest.VERSION = 5.0.0
-QT.qmltest.MAJOR_VERSION = 5
-QT.qmltest.MINOR_VERSION = 0
-QT.qmltest.PATCH_VERSION = 0
-
-QT.qmltest.name = QtQuickTest
-QT.qmltest.bins = $$QT_MODULE_BIN_BASE
-QT.qmltest.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuickTest
-QT.qmltest.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuickTest/$$QT.qmltest.VERSION
-QT.qmltest.sources = $$QT_MODULE_BASE/src/qmltest
-QT.qmltest.libs = $$QT_MODULE_LIB_BASE
-QT.qmltest.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.qmltest.imports = $$QT_MODULE_IMPORT_BASE
-QT.qmltest.depends = qml testlib
-QT.qmltest.DEFINES = QT_QMLTEST_LIB
-
-QT_CONFIG += qmltest
diff --git a/modules/qt_quick.pri b/modules/qt_quick.pri
deleted file mode 100644
index b1fc754cd8..0000000000
--- a/modules/qt_quick.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.quick.VERSION = 5.0.0
-QT.quick.MAJOR_VERSION = 5
-QT.quick.MINOR_VERSION = 0
-QT.quick.PATCH_VERSION = 0
-
-QT.quick.name = QtQuick
-QT.quick.bins = $$QT_MODULE_BIN_BASE
-QT.quick.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuick
-QT.quick.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuick/$$QT.quick.VERSION
-QT.quick.sources = $$QT_MODULE_BASE/src/quick
-QT.quick.libs = $$QT_MODULE_LIB_BASE
-QT.quick.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.quick.imports = $$QT_MODULE_IMPORT_BASE
-QT.quick.depends = qml gui
-QT.quick.DEFINES = QT_QUICK_LIB
-
-QT_CONFIG += quick
diff --git a/modules/qt_quickparticles.pri b/modules/qt_quickparticles.pri
deleted file mode 100644
index ae1064aca8..0000000000
--- a/modules/qt_quickparticles.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.quickparticles.VERSION = 5.0.0
-QT.quickparticles.MAJOR_VERSION = 5
-QT.quickparticles.MINOR_VERSION = 0
-QT.quickparticles.PATCH_VERSION = 0
-
-QT.quickparticles.name = QtQuickParticles
-QT.quickparticles.bins = $$QT_MODULE_BIN_BASE
-QT.quickparticles.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuickParticles
-QT.quickparticles.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuickParticles/$$QT.quickparticles.VERSION
-QT.quickparticles.sources = $$QT_MODULE_BASE/src/particles
-QT.quickparticles.libs = $$QT_MODULE_LIB_BASE
-QT.quickparticles.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.quickparticles.imports = $$QT_MODULE_IMPORT_BASE
-QT.quickparticles.depends = qml quick
-QT.quickparticles.DEFINES = QT_QUICKPARTICLES_LIB
-
-QT_CONFIG += quickparticles
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index f7861ac009..899c4370d7 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,5 +1,10 @@
 TEMPLATE = subdirs
 
-SUBDIRS += qtquick2 particles window folderlistmodel localstorage
-contains(QT_CONFIG, qmltest): SUBDIRS += testlib
+SUBDIRS += \
+    qtquick2 \
+    particles \
+    window \
+    folderlistmodel \
+    localstorage \
+    testlib
 contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel
diff --git a/src/particles/particles.pro b/src/particles/particles.pro
index 4a3b868c05..1daaf99c0f 100644
--- a/src/particles/particles.pro
+++ b/src/particles/particles.pro
@@ -1,14 +1,12 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = QtQuickParticles
 
-CONFIG += module
 CONFIG += dll warn_on
-MODULE_PRI = ../../modules/qt_quickparticles.pri
 
 QT = core-private gui-private qml-private quick-private
 
-DEFINES   += QT_BUILD_QUICKPARTICLES_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
+DEFINES   += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
 win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
 
diff --git a/src/particles/qtquickparticlesglobal_p.h b/src/particles/qtquickparticlesglobal_p.h
index d7814f759d..03773273fb 100644
--- a/src/particles/qtquickparticlesglobal_p.h
+++ b/src/particles/qtquickparticlesglobal_p.h
@@ -48,7 +48,7 @@
 
 #if defined(Q_OS_WIN)
 #  if defined(QT_MAKEDLL) /* create a Qt DLL library */
-#    if defined(QT_BUILD_QUICKPARTICLES_LIB)
+#    if defined(QT_BUILD_PARTICLES_LIB)
 #      define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_EXPORT
 #    else
 #      define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_IMPORT
diff --git a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
index 6f973bcc18..60f5e0b856 100644
--- a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
+++ b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
@@ -3,7 +3,7 @@ QT       += qml network
 
 load(qt_plugin)
 
-QTDIR_build:DESTDIR  = $$QT_BUILD_TREE/plugins/qmltooling
+QTDIR_build:DESTDIR  = $$QT.qml.plugins/qmltooling
 QTDIR_build:REQUIRES += "contains(QT_CONFIG, qml)"
 
 SOURCES += \
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
index b031657b20..c46dc356fa 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = qmldbg_qtquick2
 QT       += qml-private quick-private core-private gui-private v8-private
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
index ed4d6b4992..0f4272e26c 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = qmldbg_tcp
 QT       += qml-private network v8-private core-private
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index f4b2a23f94..5c165027fc 100644
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -1,26 +1,20 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET     = QtQml
-QPRO_PWD   = $$PWD
-
-CONFIG += module
-MODULE_PRI += ../../modules/qt_qml.pri
-
 QT = core-private network
 
-DEFINES   += QT_BUILD_QML_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
+DEFINES   += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
 
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
 win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
 
-unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
-
 exists("qqml_enable_gcov") {
     QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors
     LIBS += -lgcov
 }
 
+MODULE_DEFINES = QQmlImageProvider=QQuickImageProvider
 load(qt_module_config)
 
 QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
@@ -28,13 +22,9 @@ QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
 # private dependencies
 QT += v8-private
 
-HEADERS += qtqmlversion.h \
-           qtqmlglobal.h \
+HEADERS += qtqmlglobal.h \
            qtqmlglobal_p.h
 
-#INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET
-#DESTDIR=.
-
 #modules
 include(util/util.pri)
 include(qml/qml.pri)
diff --git a/src/qml/qml/ftw/ftw.pri b/src/qml/qml/ftw/ftw.pri
index c2409c6790..00d56263c6 100644
--- a/src/qml/qml/ftw/ftw.pri
+++ b/src/qml/qml/ftw/ftw.pri
@@ -24,4 +24,6 @@ SOURCES += \
     $$PWD/qqmlthread.cpp \
     $$PWD/qqmltrace.cpp \
 
-contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri)
+# mirrors logic in $$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri
+# clock_gettime() is implemented in librt on these systems
+contains(QT_CONFIG, clock-gettime):linux-*|hpux-*|solaris-*:LIBS_PRIVATE *= -lrt
diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro
index 4dd21c6110..3e6b439811 100644
--- a/src/qmldevtools/qmldevtools.pro
+++ b/src/qmldevtools/qmldevtools.pro
@@ -1,20 +1,9 @@
-load(qt_module)
+load(qt_build_config)
+
 TARGET     = QtQmlDevTools
 QT         = core
-TEMPLATE   = lib
-DESTDIR    = $$QMAKE_LIBDIR_QT
-
-CONFIG += module
 CONFIG += staticlib
 
-MODULE_PRI = ../../modules/qt_qmldevtools.pri
-
-DEFINES += QT_BUILD_QMLDEVTOOLS_LIB
-
 load(qt_module_config)
 
-HEADERS += qtqmldevtoolsversion.h
-
-unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
-
 include(../qml/qml/parser/parser.pri)
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro
index 3c08030c34..f0b265e0f9 100644
--- a/src/qmltest/qmltest.pro
+++ b/src/qmltest/qmltest.pro
@@ -1,14 +1,10 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET     = QtQuickTest
-QPRO_PWD   = $$PWD
-
-CONFIG += module
 CONFIG += dll warn_on
-MODULE_PRI += ../../modules/qt_qmltest.pri
-
 QT += qml testlib-private gui-private
-DEFINES += QT_BUILD_QUICK_TEST_LIB QT_NO_URL_CAST_FROM_STRING
+
+DEFINES += QT_NO_URL_CAST_FROM_STRING
 
 load(qt_module_config)
 
@@ -21,9 +17,6 @@ feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
 feature.files = $$PWD/features/qmltestcase.prf
 INSTALLS += feature
 
-INCLUDEPATH += $$PWD/QtQuickTest
-INCLUDEPATH += $$PWD
-
 SOURCES += \
     $$PWD/quicktest.cpp \
     $$PWD/quicktestevent.cpp \
@@ -35,5 +28,4 @@ HEADERS += \
     $$PWD/quicktestresult_p.h \
     $$PWD/qtestoptions_p.h
 
-
-DEFINES += QT_BUILD_QUICK_TEST_LIB QT_QML_DEBUG_NO_WARNING
+DEFINES += QT_QML_DEBUG_NO_WARNING
diff --git a/src/qmltest/quicktestglobal.h b/src/qmltest/quicktestglobal.h
index 103cf2456f..59bd643614 100644
--- a/src/qmltest/quicktestglobal.h
+++ b/src/qmltest/quicktestglobal.h
@@ -54,7 +54,7 @@ QT_BEGIN_HEADER
 #    if defined(QT_DLL)
 #      undef QT_DLL
 #    endif
-#    if defined(QT_BUILD_QUICK_TEST_LIB)
+#    if defined(QT_BUILD_QMLTEST_LIB)
 #        define Q_QUICK_TEST_EXPORT Q_DECL_EXPORT
 #    else
 #        define Q_QUICK_TEST_EXPORT Q_DECL_IMPORT
diff --git a/src/quick/quick.pro b/src/quick/quick.pro
index 5a0980be2d..7df0491248 100644
--- a/src/quick/quick.pro
+++ b/src/quick/quick.pro
@@ -1,14 +1,12 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = QtQuick
 
-CONFIG += module
 CONFIG += dll warn_on
-MODULE_PRI = ../../modules/qt_quick.pri
 
 QT = core-private gui-private qml-private
 
-DEFINES   += QT_BUILD_QUICK_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
+DEFINES   += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
 win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
 
diff --git a/src/src.pro b/src/src.pro
index a591ffc9a0..f1b2663c68 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,8 +1,10 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS += qml quick particles plugins
-
-contains(QT_CONFIG, qmltest): SUBDIRS += qmltest
-
-SUBDIRS += imports
-SUBDIRS += qmldevtools
+SUBDIRS += \
+    qml \
+    quick \
+    qmltest \
+    particles \
+    plugins \
+    imports \
+    qmldevtools
diff --git a/sync.profile b/sync.profile
index d4f22c7eef..7ea3be040c 100644
--- a/sync.profile
+++ b/sync.profile
@@ -8,23 +8,6 @@
 %moduleheaders = ( # restrict the module headers to those found in relative path
     "QtQmlDevTools" => "../qml/qml/parser",
 );
-%classnames = (
-    "qtqmlversion.h" => "QtQmlVersion",
-);
-%mastercontent = (
-    "gui" => "#include <QtGui/QtGui>\n",
-    "network" => "#include <QtNetwork/QtNetwork>\n",
-    "testlib" => "#include <QtTest/QtTest>\n",
-    "qml" => "#include <QtQml/QtQml>\n",
-    "quick" => "#include <QtQuick/QtQuick>\n",
-);
-%modulepris = (
-    "QtQml" => "$basedir/modules/qt_qml.pri",
-    "QtQuick" => "$basedir/modules/qt_quick.pri",
-    "QtQuickParticles" => "$basedir/modules/qt_quickparticles.pri",
-    "QtQuickTest" => "$basedir/modules/qt_qmltest.pri",
-    "QtQmlDevTools" => "$basedir/modules/qt_qmldevtools.pri",
-);
 %deprecatedheaders = (
     "QtQml" => {
         "QQmlImageProvider" => "QtQuick/QQuickImageProvider",
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 3f5ac6924d..818bbdacfc 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -4,8 +4,7 @@ SUBDIRS=\
     quick \
     headersclean \
     particles \
+    qmltest \
     qmldevtools
 
 testcocoon: SUBDIRS -= headersclean
-
-contains(QT_CONFIG, qmltest): SUBDIRS += qmltest
diff --git a/tests/auto/quick/qquickaccessible/qquickaccessible.pro b/tests/auto/quick/qquickaccessible/qquickaccessible.pro
index eef914dac5..97b013883f 100644
--- a/tests/auto/quick/qquickaccessible/qquickaccessible.pro
+++ b/tests/auto/quick/qquickaccessible/qquickaccessible.pro
@@ -18,7 +18,7 @@ OTHER_FILES += data/statictext.qml
 CONFIG += parallel_test
 
 wince*: {
-    accessneeded.files = $$QT_BUILD_TREE\\plugins\\accessible\\*.dll
+    accessneeded.files = $$QT.widgets.plugins/accessible/*.dll
     accessneeded.path = accessible
     DEPLOYMENT += accessneeded
 }
diff --git a/tools/easingcurveeditor/easingcurveeditor.pro b/tools/easingcurveeditor/easingcurveeditor.pro
index 78f2ebf528..91f6516ade 100644
--- a/tools/easingcurveeditor/easingcurveeditor.pro
+++ b/tools/easingcurveeditor/easingcurveeditor.pro
@@ -1,7 +1,3 @@
-TEMPLATE = app
-DEPENDPATH += .
-INCLUDEPATH += .
-
 QT += qml quick widgets
 CONFIG -= app_bundle
 
diff --git a/tools/easingcurveeditor/main.cpp b/tools/easingcurveeditor/main.cpp
index 05e8ace53a..eace1249a7 100644
--- a/tools/easingcurveeditor/main.cpp
+++ b/tools/easingcurveeditor/main.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
-#include <mainwindow.h>
+#include "mainwindow.h"
 
+#include <QApplication>
 
 int main(int argc, char ** argv)
 {
diff --git a/tools/easingcurveeditor/splineeditor.cpp b/tools/easingcurveeditor/splineeditor.cpp
index d4408521a8..7216e2acce 100644
--- a/tools/easingcurveeditor/splineeditor.cpp
+++ b/tools/easingcurveeditor/splineeditor.cpp
@@ -40,13 +40,13 @@
 ****************************************************************************/
 
 #include "splineeditor.h"
+#include "segmentproperties.h"
 
 #include <QPainter>
 #include <QMouseEvent>
 #include <QContextMenuEvent>
 #include <QDebug>
 #include <QApplication>
-#include <segmentproperties.h>
 
 const int canvasWidth = 640;
 const int canvasHeight = 320;
diff --git a/tools/tools.pro b/tools/tools.pro
index 1ce5667a19..396641193f 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -1,6 +1,12 @@
 TEMPLATE = subdirs
-SUBDIRS +=  qmlscene qmlplugindump qmlmin qmleasing qmlprofiler qmlbundle
+SUBDIRS += \
+    qmlscene \
+    qmlplugindump \
+    qmlmin \
+    qmleasing \
+    qmlprofiler \
+    qmlbundle \
+    qmltestrunner
 !contains(QT_CONFIG, no-widgets):SUBDIRS += easingcurveeditor
-contains(QT_CONFIG, qmltest): SUBDIRS += qmltestrunner