diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2011-09-23 17:49:49 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-26 02:16:25 +0200 |
commit | 247dcc770b7ff7d214ea889b83fd346d067278e8 (patch) | |
tree | 4585b4fac676b25404bf5afe629186d908a3853e /src | |
parent | 91ae6f5e9408fdccba509a9af21127ee8a54a07b (diff) |
Move resource policy usage to a config test.
MeeGo uses this too.
Change-Id: I0b7ec00538289d4a3beea62da08233c0d1eb45a2
Reviewed-on: http://codereview.qt-project.org/5447
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp | 4 | ||||
-rw-r--r-- | src/plugins/gstreamer/gstreamer.pro | 7 | ||||
-rw-r--r-- | src/plugins/gstreamer/mediaplayer/playerresourcepolicy.cpp | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp index 149524b73..df5583d14 100644 --- a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp @@ -41,10 +41,6 @@ #include "camerabinresourcepolicy.h" -#ifdef Q_WS_MAEMO_6 -#define HAVE_RESOURCE_POLICY -#endif - //#define DEBUG_RESOURCE_POLICY #include <QtCore/qdebug.h> #include <QtCore/qset.h> diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro index ddcfaf97f..550040ecf 100644 --- a/src/plugins/gstreamer/gstreamer.pro +++ b/src/plugins/gstreamer/gstreamer.pro @@ -27,11 +27,16 @@ PKGCONFIG += \ maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10 contains(config_test_gstreamer_appsrc, yes): PKGCONFIG += gstreamer-app-0.10 +contains(config_test_resourcepolicy, yes) { + DEFINES += HAVE_RESOURCE_POLICY + PKGCONFIG += libresourceqt1 +} + maemo6 { HEADERS += camerabuttonlistener_meego.h SOURCES += camerabuttonlistener_meego.cpp - PKGCONFIG += qmsystem2 libresourceqt1 + PKGCONFIG += qmsystem2 isEqual(QT_ARCH,armv6) { HEADERS += qgstreamergltexturerenderer.h diff --git a/src/plugins/gstreamer/mediaplayer/playerresourcepolicy.cpp b/src/plugins/gstreamer/mediaplayer/playerresourcepolicy.cpp index 730427a8d..8b49cfce3 100644 --- a/src/plugins/gstreamer/mediaplayer/playerresourcepolicy.cpp +++ b/src/plugins/gstreamer/mediaplayer/playerresourcepolicy.cpp @@ -41,10 +41,6 @@ #include "playerresourcepolicy.h" -#ifdef Q_WS_MAEMO_6 -#define HAVE_RESOURCE_POLICY -#endif - //#define DEBUG_RESOURCE_POLICY #include <QtCore/qdebug.h> |