From 99fff6941ba6b1929c1bd8d46dc8776a6cbf11c6 Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Date: Sat, 7 Sep 2013 19:56:02 +0200
Subject: Fix the X11 build error

This makes qtmultimedia build again by moving down X11 includes.
See http://lists.qt-project.org/pipermail/development/2013-September/012986.html

Change-Id: If6cd5e80c27de7aaa8d2a65ded05500ed9d0e692
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
---
 src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/multimedia/gsttools_headers')

diff --git a/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h b/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h
index 30cc4c993..559d867d3 100644
--- a/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h
+++ b/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h
@@ -59,6 +59,9 @@
 #include <QtCore/qwaitcondition.h>
 #include <QtCore/qqueue.h>
 
+#include <gst/gst.h>
+#include "qgstbufferpoolinterface_p.h"
+
 #include <X11/Xlib.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
@@ -67,9 +70,6 @@
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvlib.h>
 
-#include <gst/gst.h>
-#include "qgstbufferpoolinterface_p.h"
-
 QT_BEGIN_NAMESPACE
 
 class QGstXvImageBufferPool;
-- 
cgit v1.2.3