diff options
-rw-r--r-- | config.tests/resourcepolicy/main.cpp | 50 | ||||
-rw-r--r-- | config.tests/resourcepolicy/resourcepolicy.pro | 14 | ||||
-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 | ||||
-rw-r--r-- | sync.profile | 1 |
6 files changed, 71 insertions, 9 deletions
diff --git a/config.tests/resourcepolicy/main.cpp b/config.tests/resourcepolicy/main.cpp new file mode 100644 index 000000000..711945a51 --- /dev/null +++ b/config.tests/resourcepolicy/main.cpp @@ -0,0 +1,50 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Mobility Components. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <policy/resource.h> +#include <policy/resources.h> +#include <policy/resource-set.h> + +int main(int argc, char** argv) +{ + ResourcePolicy::ResourceSet *set = new ResourcePolicy::ResourceSet("player", this); + return 0; +} diff --git a/config.tests/resourcepolicy/resourcepolicy.pro b/config.tests/resourcepolicy/resourcepolicy.pro new file mode 100644 index 000000000..79fa6a14b --- /dev/null +++ b/config.tests/resourcepolicy/resourcepolicy.pro @@ -0,0 +1,14 @@ +TEMPLATE = app +DEPENDPATH += . +INCLUDEPATH += . + +requires(unix) + +# Input +SOURCES += main.cpp + +CONFIG += link_pkgconfig + +PKGCONFIG += \ + libresourceqt1 + 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> diff --git a/sync.profile b/sync.profile index 3249554db..57945b1b2 100644 --- a/sync.profile +++ b/sync.profile @@ -48,4 +48,5 @@ "gstreamer_photography" => {}, "gstreamer_appsrc" => {}, "pulseaudio" => {}, + "resourcepolicy" => {}, ); |