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/qmltest | |
| 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/qmltest')
| -rw-r--r-- | src/qmltest/qmltest.pro | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro index c0b083a388..f0b265e0f9 100644 --- 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 |