build system cleanups

- load(qt_module) => load(qt_build_config)
- remove:
  - CONFIG+=module (obsolete)
  - setup of PKGCONFIG* variables (automated now)
  - code relating to module version headers (automated now)
  - %mastercontent assignment (automated now)
  - QT_BUILD_*_LIB defines (automated now)
  - pointless QPRO_PWD assignments
  - pointless and commented out include and depend paths
  - qmake -project boilerplate

Change-Id: Ib2d80a375e88bae1b50a22a274374b7e2cc2a86c
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

diff --git a/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/quick/modelviews/abstractitemmodel/abstractitemmodel.pro
index f786d93..cde1d2f 100644 (file)
--- 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/src/particles/particles.pro b/src/particles/particles.pro
index 399f4d3..1daaf99 100644 (file)
--- a/src/particles/particles.pro
+++ b/src/particles/particles.pro
@@ -1,13 +1,12 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = QtQuickParticles
 
-CONFIG += module
 CONFIG += dll warn_on
 
 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/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
index b031657..c46dc35 100644 (file)
--- 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 ed4d6b4..0f4272e 100644 (file)
--- 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 15594f1..311ee3c 100644 (file)
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -1,20 +1,14 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET     = QtQml
-QPRO_PWD   = $$PWD
-
-CONFIG += module
-
 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
@@ -26,13 +20,9 @@ load(qt_module_config)
 # 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/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro
index 2312581..3e6b439 100644 (file)
--- a/src/qmldevtools/qmldevtools.pro
+++ b/src/qmldevtools/qmldevtools.pro
@@ -1,18 +1,9 @@
-load(qt_module)
+load(qt_build_config)
+
 TARGET     = QtQmlDevTools
 QT         = core
-TEMPLATE   = lib
-DESTDIR    = $$QMAKE_LIBDIR_QT
-
-CONFIG += module
 CONFIG += staticlib
 
-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 c0b083a..f0b265e 100644 (file)
--- a/src/qmltest/qmltest.pro
+++ b/src/qmltest/qmltest.pro
@@ -1,13 +1,10 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET     = QtQuickTest
-QPRO_PWD   = $$PWD
-
-CONFIG += module
 CONFIG += dll warn_on
-
 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)
 
@@ -20,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 \
@@ -34,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/quick/quick.pro b/src/quick/quick.pro
index 023f9e4..29098e4 100644 (file)
--- a/src/quick/quick.pro
+++ b/src/quick/quick.pro
@@ -1,13 +1,12 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = QtQuick
 
-CONFIG += module
 CONFIG += dll warn_on
 
 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/sync.profile b/sync.profile
index 2bfe12d..7ea3be0 100644 (file)
--- a/sync.profile
+++ b/sync.profile
@@ -8,16 +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",
-);
 %deprecatedheaders = (
     "QtQml" => {
         "QQmlImageProvider" => "QtQuick/QQuickImageProvider",

diff --git a/tools/easingcurveeditor/easingcurveeditor.pro b/tools/easingcurveeditor/easingcurveeditor.pro
index 78f2ebf..91f6516 100644 (file)
--- 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