diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 12:31:24 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 14:53:24 +0200 |
| commit | 37e014504c6b54762b9e43a30d4b0b0abdc15db6 (patch) | |
| tree | 25029bd4df38d69560005cd2e18baca3d016c6c6 | |
| parent | 747e9b69072360768f51dbc71910439a248ec510 (diff) | |
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
Change-Id: I4b3a1cd560e99658102d374fb278fe3e7744bae9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | src/declarative/declarative.pro | 9 | ||||
| -rw-r--r-- | sync.profile | 10 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 39b785a1..0d3a505d 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -1,9 +1,6 @@ -load(qt_module) +load(qt_build_config) TARGET = QtQuick1 -QPRO_PWD = $$PWD - -CONFIG += module QT = core-private gui-private widgets-private script-private MODULE=quick1 @@ -13,13 +10,11 @@ load(qt_module_config) # private dependencies QT += xmlpatterns -DEFINES += QT_BUILD_QUICK1_LIB QT_NO_URL_CAST_FROM_STRING +DEFINES += QT_NO_URL_CAST_FROM_STRING win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui - exists("qdeclarative_enable_gcov") { QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors LIBS += -lgcov diff --git a/sync.profile b/sync.profile index d6f8ac81..5d8d4418 100644 --- a/sync.profile +++ b/sync.profile @@ -1,16 +1,6 @@ %modules = ( # path to module name map "QtQuick1" => "$basedir/src/declarative", ); -%classnames = ( - "qtquick1version.h" => "QtQuick1Version", -); -%mastercontent = ( - "gui" => "#include <QtGui/QtGui>\n", - "widgets" => "#include <QtWidgets/QtWidgets>\n", - "script" => "#include <QtScript/QtScript>\n", - "network" => "#include <QtNetwork/QtNetwork>\n", - "testlib" => "#include <QtTest/QtTest>\n", -); # Module dependencies. # Every module that is required to build this module should have one entry. # Each of the module version specifiers can take one of the following values: |