diff options
-rw-r--r-- | config.tests/gpu_vivante/gpu_vivante.pro | 1 | ||||
-rw-r--r-- | config.tests/gpu_vivante/main.cpp | 50 | ||||
-rw-r--r-- | qtmultimedia.pro | 1 | ||||
-rw-r--r-- | src/plugins/videonode/videonode.pro | 2 |
4 files changed, 53 insertions, 1 deletions
diff --git a/config.tests/gpu_vivante/gpu_vivante.pro b/config.tests/gpu_vivante/gpu_vivante.pro new file mode 100644 index 000000000..28dcadcbf --- /dev/null +++ b/config.tests/gpu_vivante/gpu_vivante.pro @@ -0,0 +1 @@ +SOURCES += main.cpp diff --git a/config.tests/gpu_vivante/main.cpp b/config.tests/gpu_vivante/main.cpp new file mode 100644 index 000000000..d75e952b0 --- /dev/null +++ b/config.tests/gpu_vivante/main.cpp @@ -0,0 +1,50 @@ +/**************************************************************************** +** +** 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 <GLES2/gl2.h> +#include <GLES2/gl2ext.h> + +const int format = GL_VIV_YV12; + +int main(int argc, char** argv) +{ + return 0; +} diff --git a/qtmultimedia.pro b/qtmultimedia.pro index 404a2bf51..1deaab2aa 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -27,6 +27,7 @@ win32 { qtCompileTest(gstreamer_appsrc) } qtCompileTest(resourcepolicy) + qtCompileTest(gpu_vivante) } load(qt_parts) diff --git a/src/plugins/videonode/videonode.pro b/src/plugins/videonode/videonode.pro index ecc1c0cf0..c311200d3 100644 --- a/src/plugins/videonode/videonode.pro +++ b/src/plugins/videonode/videonode.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -*imx6* { +config_gpu_vivante { SUBDIRS += imx6 } |