diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-26 17:59:46 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-26 17:59:46 +0200 |
commit | 4189a0d294999246f5a9680d348a1d160d4f591c (patch) | |
tree | f0ca75c7dcee691b5ff98f55991dcdf635d19f4c /src/qml | |
parent | bdefc3a2a8f8d91a48f822e2281670d8a6b9efbc (diff) | |
parent | 489651ef7f0e17e210e8a85f8fa95617d14ca7cf (diff) |
Merge branch 'buildsystem'
Change-Id: I230e776290761be7c811c3aec4d915367012fc99
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/qml.pro | 18 | ||||
-rw-r--r-- | src/qml/qml/ftw/ftw.pri | 4 |
2 files changed, 7 insertions, 15 deletions
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 |