diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-07-27 12:34:09 +0300 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-07-27 12:34:09 +0300 |
| commit | 122d2550fe44ac6f1ae7099bb2eef2489c63a92b (patch) | |
| tree | d73c29b713e9c77132475cd62e090812592f13c6 /examples | |
| parent | 76b9f821d517dbd4a784a5b35de30b8d35c316c0 (diff) | |
| parent | 509dbb646b9d2906084ecfadfcb997341506767d (diff) | |
Merge branch 'master' into refactor
Conflicts:
examples/qml-compositor/qml-compositor.pro
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qwidget-compositor-mdi/qt-compositor.pro | 4 | ||||
| -rw-r--r-- | examples/qwidget-compositor/qt-compositor.pro | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/examples/qwidget-compositor-mdi/qt-compositor.pro b/examples/qwidget-compositor-mdi/qt-compositor.pro index f6f8907..3cd110b 100644 --- a/examples/qwidget-compositor-mdi/qt-compositor.pro +++ b/examples/qwidget-compositor-mdi/qt-compositor.pro @@ -6,10 +6,6 @@ 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/ include (../../src/qt-compositor/qt-compositor.pri) diff --git a/examples/qwidget-compositor/qt-compositor.pro b/examples/qwidget-compositor/qt-compositor.pro index 69c3c42..353b34c 100644 --- a/examples/qwidget-compositor/qt-compositor.pro +++ b/examples/qwidget-compositor/qt-compositor.pro @@ -6,10 +6,6 @@ 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/ include (../../src/qt-compositor/qt-compositor.pri) @@ -32,3 +28,4 @@ SOURCES += $$TOUCHSCREEN_BASE/qtouchscreen.cpp HEADERS += $$TOUCHSCREEN_BASE/qtouchscreen.h INCLUDEPATH += $$TOUCHSCREEN_BASE LIBS += -ludev -lmtdev +QT += gui-private |