diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-19 19:04:17 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-19 19:04:40 +0200 |
| commit | 5216290592b9e5cfba5b87e54b4cde90fe2db4b3 (patch) | |
| tree | 26f24584f31db55fa1eb1df70891d914d214ece8 /examples | |
| parent | 88f6d99a02448f8b034990759afe92ae0924dfe1 (diff) | |
Prevent qmake warnings when not building against Qt 5.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qml-compositor/qml-compositor.pro | 6 | ||||
| -rw-r--r-- | examples/qwidget-compositor/qt-compositor.pro | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro index 7e6032c9b..03f97cce2 100644 --- a/examples/qml-compositor/qml-compositor.pro +++ b/examples/qml-compositor/qml-compositor.pro @@ -12,13 +12,15 @@ CONFIG += use_pkgconfig DESTDIR=$$PWD/../../bin/ -QT += core-private gui-private declarative-private opengl-private - LIBS += -L ../../lib QT += declarative QT += opengl +!isEmpty(QT.core.MAJOR_VERSION):greaterThan(QT.core.MAJOR_VERSION, 4) { + QT += core-private gui-private declarative-private opengl-private +} + include (../../src/qt-compositor/qt-compositor.pri) # Input diff --git a/examples/qwidget-compositor/qt-compositor.pro b/examples/qwidget-compositor/qt-compositor.pro index c2089af68..b7211b776 100644 --- a/examples/qwidget-compositor/qt-compositor.pro +++ b/examples/qwidget-compositor/qt-compositor.pro @@ -6,7 +6,9 @@ INCLUDEPATH += . # comment out the following to not use pkg-config in the pri files CONFIG += use_pkgconfig +!isEmpty(QT.core.MAJOR_VERSION):greaterThan(QT.core.MAJOR_VERSION, 4) { QT += core-private gui-private +} DESTDIR=$$PWD/../../bin/ |