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
50
config.tests/resourcepolicy/main.cpp
Normal file
50
config.tests/resourcepolicy/main.cpp
Normal file
@@ -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;
|
||||||
|
}
|
||||||
14
config.tests/resourcepolicy/resourcepolicy.pro
Normal file
14
config.tests/resourcepolicy/resourcepolicy.pro
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
TEMPLATE = app
|
||||||
|
DEPENDPATH += .
|
||||||
|
INCLUDEPATH += .
|
||||||
|
|
||||||
|
requires(unix)
|
||||||
|
|
||||||
|
# Input
|
||||||
|
SOURCES += main.cpp
|
||||||
|
|
||||||
|
CONFIG += link_pkgconfig
|
||||||
|
|
||||||
|
PKGCONFIG += \
|
||||||
|
libresourceqt1
|
||||||
|
|
||||||
@@ -41,10 +41,6 @@
|
|||||||
|
|
||||||
#include "camerabinresourcepolicy.h"
|
#include "camerabinresourcepolicy.h"
|
||||||
|
|
||||||
#ifdef Q_WS_MAEMO_6
|
|
||||||
#define HAVE_RESOURCE_POLICY
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//#define DEBUG_RESOURCE_POLICY
|
//#define DEBUG_RESOURCE_POLICY
|
||||||
#include <QtCore/qdebug.h>
|
#include <QtCore/qdebug.h>
|
||||||
#include <QtCore/qset.h>
|
#include <QtCore/qset.h>
|
||||||
|
|||||||
@@ -27,11 +27,16 @@ PKGCONFIG += \
|
|||||||
maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10
|
maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10
|
||||||
contains(config_test_gstreamer_appsrc, yes): PKGCONFIG += gstreamer-app-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 {
|
maemo6 {
|
||||||
HEADERS += camerabuttonlistener_meego.h
|
HEADERS += camerabuttonlistener_meego.h
|
||||||
SOURCES += camerabuttonlistener_meego.cpp
|
SOURCES += camerabuttonlistener_meego.cpp
|
||||||
|
|
||||||
PKGCONFIG += qmsystem2 libresourceqt1
|
PKGCONFIG += qmsystem2
|
||||||
|
|
||||||
isEqual(QT_ARCH,armv6) {
|
isEqual(QT_ARCH,armv6) {
|
||||||
HEADERS += qgstreamergltexturerenderer.h
|
HEADERS += qgstreamergltexturerenderer.h
|
||||||
|
|||||||
@@ -41,10 +41,6 @@
|
|||||||
|
|
||||||
#include "playerresourcepolicy.h"
|
#include "playerresourcepolicy.h"
|
||||||
|
|
||||||
#ifdef Q_WS_MAEMO_6
|
|
||||||
#define HAVE_RESOURCE_POLICY
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//#define DEBUG_RESOURCE_POLICY
|
//#define DEBUG_RESOURCE_POLICY
|
||||||
#include <QtCore/qdebug.h>
|
#include <QtCore/qdebug.h>
|
||||||
|
|
||||||
|
|||||||
@@ -48,4 +48,5 @@
|
|||||||
"gstreamer_photography" => {},
|
"gstreamer_photography" => {},
|
||||||
"gstreamer_appsrc" => {},
|
"gstreamer_appsrc" => {},
|
||||||
"pulseaudio" => {},
|
"pulseaudio" => {},
|
||||||
|
"resourcepolicy" => {},
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user