From 4f3294930af1ea4350bc8dd5225afd17591f16cd Mon Sep 17 00:00:00 2001
From: Jonas Rabbe <jonas.rabbe@nokia.com>
Date: Fri, 9 Dec 2011 11:45:11 +1000
Subject: Fix X11 and QPA compilation problems

The X11 buffer pool was using outdated APIs, and as the 'qpa'
configuration value is being removed, it caused the X11 code
to be pulled in, and therefore cause compilation failures.

Change-Id: I5fdaed854c6525716fccca44b5fbd0b850880cb9
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
---
 config.tests/xvideo/main.cpp   | 53 ++++++++++++++++++++++++++++++++++++++++++
 config.tests/xvideo/xvideo.pro | 16 +++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 config.tests/xvideo/main.cpp
 create mode 100644 config.tests/xvideo/xvideo.pro

(limited to 'config.tests')

diff --git a/config.tests/xvideo/main.cpp b/config.tests/xvideo/main.cpp
new file mode 100644
index 000000000..b74641a71
--- /dev/null
+++ b/config.tests/xvideo/main.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** 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 Qt Multimedia module 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 <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
new file mode 100644
index 000000000..749091eba
--- /dev/null
+++ b/config.tests/xvideo/xvideo.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+DEPENDPATH += .
+INCLUDEPATH += .
+
+requires(unix)
+
+# Input
+SOURCES += main.cpp
+
+CONFIG += link_pkgconfig
+
+PKGCONFIG += \
+    x11 \
+    xext \
+    xv
+
-- 
cgit v1.2.3