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/qml | |
parent | bdefc3a2a8f8d91a48f822e2281670d8a6b9efbc (diff) | |
parent | 489651ef7f0e17e210e8a85f8fa95617d14ca7cf (diff) |
Merge branch 'buildsystem'
Change-Id: I230e776290761be7c811c3aec4d915367012fc99
Diffstat (limited to 'src/qml/qml')
-rw-r--r-- | src/qml/qml/ftw/ftw.pri | 4 |
1 files changed, 3 insertions, 1 deletions
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 |