diff options
| author | George Kiagiadakis <george.kiagiadakis@collabora.co.uk> | 2011-01-08 12:10:48 +0200 |
|---|---|---|
| committer | George Kiagiadakis <george.kiagiadakis@collabora.co.uk> | 2011-01-08 12:10:48 +0200 |
| commit | 2814f71c2a7bdb27d2c75880a675e5e498823951 (patch) | |
| tree | 2b1e36aa4ec46beeca085e99436dce1d2e695ced /examples | |
| parent | d3ecd1955d50fca5f550f6ccea22f6be70e09c34 (diff) | |
Fix the example qmake project files to use pkg-config.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/echo/echo.pro | 19 | ||||
| -rw-r--r-- | examples/player/player.pro | 19 |
2 files changed, 16 insertions, 22 deletions
diff --git a/examples/echo/echo.pro b/examples/echo/echo.pro index fafd7e9..f66d2b2 100644 --- a/examples/echo/echo.pro +++ b/examples/echo/echo.pro @@ -1,23 +1,20 @@ # This is a qmake project file, provided as an example on how to use qmake with QtGStreamer. -# There is nothing special about it, the only difference with a normal qmake project -# is that you specify INCLUDEPATH and LIBS to point to QtGStreamer. Unfortunately, qmake -# does not provide features like searching for libraries, so both the include path and the -# library path have to be typed manually here. It is recommended to use cmake instead, -# unless you have a reason to use qmake. TEMPLATE = app TARGET = echo -# Change this to point to the location where the QtGStreamer headers are installed -INCLUDEPATH += /usr/local/include/QtGStreamer +# Tell qmake to use pkg-config to find QtGStreamer. +CONFIG += link_pkgconfig -# Change this to point to the location where the QtGStreamer library is installed -LIBS += -L/usr/local/lib -lQtGStreamer +# Now tell qmake to link to QtGStreamer-0.10 and also use its include path and Cflags. +# Also add QtGStreamerUi-0.10 here if you are using classes from QGst::Ui +PKGCONFIG += QtGStreamer-0.10 -# Recommended if you are using g++ 4.3 or later. Must be removed for other compilers. -QMAKE_CXXFLAGS += -std=c++0x +# Recommended if you are using g++ 4.5 or later. Must be removed for other compilers. +#QMAKE_CXXFLAGS += -std=c++0x # Recommended, to avoid possible issues with the "emit" keyword +# You can otherwise also define QT_NO_EMIT, but notice that this is not a documented Qt macro. DEFINES += QT_NO_KEYWORDS # This example has no GUI diff --git a/examples/player/player.pro b/examples/player/player.pro index a3c544b..b75e5d1 100644 --- a/examples/player/player.pro +++ b/examples/player/player.pro @@ -1,23 +1,20 @@ # This is a qmake project file, provided as an example on how to use qmake with QtGStreamer. -# There is nothing special about it, the only difference with a normal qmake project -# is that you specify INCLUDEPATH and LIBS to point to QtGStreamer. Unfortunately, qmake -# does not provide features like searching for libraries, so both the include path and the -# library path have to be typed manually here. It is recommended to use cmake instead, -# unless you have a reason to use qmake. TEMPLATE = app TARGET = player -# Change this to point to the location where the QtGStreamer headers are installed -INCLUDEPATH += /usr/local/include/QtGStreamer +# Tell qmake to use pkg-config to find QtGStreamer. +CONFIG += link_pkgconfig -# Change this to point to the location where the QtGStreamer library is installed -LIBS += -L/usr/local/lib -lQtGStreamer +# Now tell qmake to link to QtGStreamer-0.10 and also use its include path and Cflags. +# Also add QtGStreamerUi-0.10 here if you are using classes from QGst::Ui +PKGCONFIG += QtGStreamer-0.10 -# Recommended if you are using g++ 4.3 or later. Must be removed for other compilers. -QMAKE_CXXFLAGS += -std=c++0x +# Recommended if you are using g++ 4.5 or later. Must be removed for other compilers. +#QMAKE_CXXFLAGS += -std=c++0x # Recommended, to avoid possible issues with the "emit" keyword +# You can otherwise also define QT_NO_EMIT, but notice that this is not a documented Qt macro. DEFINES += QT_NO_KEYWORDS # This example has no GUI |