From b15144718961653e976fed4f011bd33359975ef8 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 12 Oct 2011 17:34:18 +1000 Subject: Don't build empty test. The mediaobject_wince_ds9 is for Windows CE only. Avoid building it as an empty test on other platforms. Change-Id: I7a661f6155f220d1791bda0dff606a258179c0d8 Reviewed-on: http://codereview.qt-project.org/6501 Sanity-Review: Qt Sanity Bot Reviewed-by: Rohan McGovern --- tests/auto/mediaobject_wince_ds9/dummy.cpp | 44 ---------------------- .../mediaobject_wince_ds9.pro | 21 +++-------- tests/auto/phonon.pro | 4 +- 3 files changed, 9 insertions(+), 60 deletions(-) delete mode 100644 tests/auto/mediaobject_wince_ds9/dummy.cpp diff --git a/tests/auto/mediaobject_wince_ds9/dummy.cpp b/tests/auto/mediaobject_wince_ds9/dummy.cpp deleted file mode 100644 index 0b403c3..0000000 --- a/tests/auto/mediaobject_wince_ds9/dummy.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $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 - -QTEST_NOOP_MAIN - diff --git a/tests/auto/mediaobject_wince_ds9/mediaobject_wince_ds9.pro b/tests/auto/mediaobject_wince_ds9/mediaobject_wince_ds9.pro index 24d4634..1b9fbb0 100644 --- a/tests/auto/mediaobject_wince_ds9/mediaobject_wince_ds9.pro +++ b/tests/auto/mediaobject_wince_ds9/mediaobject_wince_ds9.pro @@ -1,19 +1,10 @@ -############################################################ -# Project file for autotest for file mediaobject.h -############################################################ - CONFIG += testcase TARGET = tst_mediaobject_wince_ds9 -QT += testlib -contains(QT_CONFIG, phonon):QT += phonon +QT += testlib phonon -wince*{ - SOURCES += ../mediaobject/tst_mediaobject.cpp - HEADERS += ../mediaobject/qtesthelper.h - RESOURCES += ../mediaobject/mediaobject.qrc - DEPLOYMENT_PLUGIN += phonon_ds9 - DEFINES += tst_MediaObject=tst_MediaObject_ds9 -} else { - SOURCES += dummy.cpp -} +SOURCES += ../mediaobject/tst_mediaobject.cpp +HEADERS += ../mediaobject/qtesthelper.h +RESOURCES += ../mediaobject/mediaobject.qrc +DEPLOYMENT_PLUGIN += phonon_ds9 +DEFINES += tst_MediaObject=tst_MediaObject_ds9 diff --git a/tests/auto/phonon.pro b/tests/auto/phonon.pro index 7549428..cd5e4e6 100644 --- a/tests/auto/phonon.pro +++ b/tests/auto/phonon.pro @@ -1,5 +1,7 @@ TEMPLATE=subdirs SUBDIRS=\ mediaobject \ -# mediaobject_wince_ds9 \ This is Windows CE only (we test the second phonon backend ds9 here) + mediaobject_wince_ds9 \ +# This is for Windows CE only (we test the second phonon backend ds9 here) +!wince*: SUBDIRS -= mediaobject_wince_ds9 -- cgit v1.2.3