diff options
author | Donald Carr <donald.carr@nokia.com> | 2012-06-06 20:10:11 +0000 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2012-06-11 12:57:00 +0200 |
commit | 4097fb07df32eb3c748b75088684dd17a15970c9 (patch) | |
tree | 1f02160c17e5b699c8e7a9fa34e620d7a2402f9f /examples | |
parent | b0a4355c5320eecdf008521e1b40cd221e8352f2 (diff) |
Introduce standard pkg-config usage
Use our own qualified pkg-config mkspec feature rather than directly
executing the system binary
Change-Id: I4b162cd8d2d9a8bd5d0b3adb9ca935df9ff96a69
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qml-compositor/qml-compositor.pro | 3 | ||||
-rw-r--r-- | examples/qwidget-compositor/qwidget-compositor.pro | 3 | ||||
-rw-r--r-- | examples/qwindow-compositor/qwindow-compositor.pro | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro index dd99f8c64..0bc0b02d6 100644 --- a/examples/qml-compositor/qml-compositor.pro +++ b/examples/qml-compositor/qml-compositor.pro @@ -1,8 +1,5 @@ DEFINES += QT_COMPOSITOR_QUICK -# comment out the following to not use pkg-config in the pri files -CONFIG += use_pkgconfig - LIBS += -L ../../lib QT += quick qml v8 diff --git a/examples/qwidget-compositor/qwidget-compositor.pro b/examples/qwidget-compositor/qwidget-compositor.pro index beec269ca..20dce5a62 100644 --- a/examples/qwidget-compositor/qwidget-compositor.pro +++ b/examples/qwidget-compositor/qwidget-compositor.pro @@ -1,6 +1,3 @@ -# comment out the following to not use pkg-config in the pri files -CONFIG += use_pkgconfig - # if you want to compile QtCompositor as part of the application # instead of linking to it, remove the QT += compositor and uncomment # the following line diff --git a/examples/qwindow-compositor/qwindow-compositor.pro b/examples/qwindow-compositor/qwindow-compositor.pro index 068b08893..465c0d997 100644 --- a/examples/qwindow-compositor/qwindow-compositor.pro +++ b/examples/qwindow-compositor/qwindow-compositor.pro @@ -1,8 +1,5 @@ QT += gui gui-private core-private compositor -# comment out the following to not use pkg-config in the pri files -CONFIG += use_pkgconfig - LIBS += -L ../../lib #include (../../src/qt-compositor/qt-compositor.pri) |