From 1235fb99101d56694edfa018b4cf6cfae653fa36 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Fri, 25 Oct 2013 12:49:40 +0200 Subject: OpenSL ES: enable the plugin only on Android. Removed the configure test to enable or not the plugin (which solves the problem of the plugin not being built on Windows because of a bug in QMake). Even though it should work on other OpenSL ES implementations than the Android one, it hasn't been tested. Compile and use the plugin only on Android for now. Task-number: QTBUG-34275 Change-Id: I02d47c8be3be8163a17c68b44b8c4b18a218a3fe Reviewed-by: Christian Stromme --- config.tests/opensles/main.cpp | 47 -------------------------------------- config.tests/opensles/opensles.pro | 2 -- 2 files changed, 49 deletions(-) delete mode 100644 config.tests/opensles/main.cpp delete mode 100644 config.tests/opensles/opensles.pro (limited to 'config.tests') diff --git a/config.tests/opensles/main.cpp b/config.tests/opensles/main.cpp deleted file mode 100644 index 45fd2f05d..000000000 --- a/config.tests/opensles/main.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, 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, Digia gives you certain additional -** rights. These rights are described in the Digia 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. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -int main() -{ - return 0; -} diff --git a/config.tests/opensles/opensles.pro b/config.tests/opensles/opensles.pro deleted file mode 100644 index def49c7ac..000000000 --- a/config.tests/opensles/opensles.pro +++ /dev/null @@ -1,2 +0,0 @@ -LIBS += -lOpenSLES -SOURCES += main.cpp -- cgit v1.2.3