diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 12:09:53 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 14:59:01 +0200 |
| commit | 489651ef7f0e17e210e8a85f8fa95617d14ca7cf (patch) | |
| tree | 5bfab7775a776eb72d8a6b96f07322d7a8258195 /src/qml/qml.pro | |
| parent | 27416448a1c3259ecad80172ba35ab9aa504a78d (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
- pointless and commented out include and depend paths
- qmake -project boilerplate
Change-Id: Ib2d80a375e88bae1b50a22a274374b7e2cc2a86c
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/qml/qml.pro')
| -rw-r--r-- | src/qml/qml.pro | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/qml/qml.pro b/src/qml/qml.pro index 15594f1a5d..311ee3ca4d 100644 --- 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) |