diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2013-09-20 14:02:24 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 14:37:06 +0200 |
| commit | c3ca3a760e85fc66146d61b2f3ac09e97197b9e9 (patch) | |
| tree | a2102899637bce3f7c3f4de04fd0fad958c25b28 /config.tests | |
| parent | ac029c65f273ce5dd20da8e84d1bcff2fd6749d4 (diff) | |
Some cleanup in the GStreamer plugin.
Removed QGstreamerVideoOverlay and related classes. It was used as
'Window' control but performs worse than QGstreamerVideoWindow which
does basically the same thing using GStreamer ready-made components
instead.
Removed X11 dependencies and related configuration tests. It was only
needed for QGstreamerVideoOverlay.
Change-Id: I2ad2636ccf0060e56cd64f3d9e5b3c24dc75f5a3
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/xvideo/main.cpp | 53 | ||||
| -rw-r--r-- | config.tests/xvideo/xvideo.pro | 8 |
2 files changed, 0 insertions, 61 deletions
diff --git a/config.tests/xvideo/main.cpp b/config.tests/xvideo/main.cpp deleted file mode 100644 index fb7b48768..000000000 --- a/config.tests/xvideo/main.cpp +++ /dev/null @@ -1,53 +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 Multimedia module 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 <X11/Xlib.h> -#include <X11/extensions/Xv.h> -#include <X11/extensions/Xvlib.h> - -int main(int argc, char** argv) -{ - unsigned int count = 0; - XvAdaptorInfo *adaptors = 0; - XvQueryAdaptors(0, 0, &count, &adaptors); - return 0; -} - diff --git a/config.tests/xvideo/xvideo.pro b/config.tests/xvideo/xvideo.pro deleted file mode 100644 index 69326e5b1..000000000 --- a/config.tests/xvideo/xvideo.pro +++ /dev/null @@ -1,8 +0,0 @@ -SOURCES += main.cpp - -CONFIG += link_pkgconfig - -PKGCONFIG += \ - x11 \ - xext \ - xv |