Merge branch 'buildsystem'

Change-Id: I230e776290761be7c811c3aec4d915367012fc99

13 files changed, 37 insertions, 61 deletions

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