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>
This commit is contained in:
committed by
Qt by Nokia
parent
91ae6f5e94
commit
247dcc770b
@@ -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>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user