gistfile1.txt

diff --git a/src/platformsupport/eglconvenience/qeglconvenience_p.h b/src/platformsupport/eglconvenience/qeglconvenience_p.h
index ec6f668..9ac4aed 100644
--- a/src/platformsupport/eglconvenience/qeglconvenience_p.h
+++ b/src/platformsupport/eglconvenience/qeglconvenience_p.h
@@ -50,6 +50,44 @@
 #include <QtCore/QSizeF>
 #include <EGL/egl.h>
 
+/*
+    Fix for the QT5 programming issue: conflict between #define CursorShape 0
+    in X.h (X11) & Qt::CursorShape, which resulted in compile errors.
+    Somehow the QT guys didnt catch this programming error.
+    [BUG:FIXME]: CursorShape isnt not restored later
+*/
+#ifdef CursorShape
+#undef CursorShape
+#endif
+
+#ifdef None
+#undef None
+#endif
+
+#ifdef Expose
+#undef Expose
+#endif
+
+#ifdef KeyPress
+#undef KeyPress
+#endif
+
+#ifdef KeyRelease
+#undef KeyRelease
+#endif
+
+#ifdef FocusIn
+#undef FocusIn
+#endif
+
+#ifdef FocusOut
+#undef FocusOut
+#endif
+
+#ifdef FontChange
+#undef FontChange
+#endif
+
 QT_BEGIN_NAMESPACE
 
 QVector<EGLint> q_createConfigAttributesFromFormat(const QSurfaceFormat &format);
diff --git a/src/platformsupport/eglconvenience/qeglpbuffer.cpp b/src/platformsupport/eglconvenience/qeglpbuffer.cpp
index d1a3164..edfde11 100644
--- a/src/platformsupport/eglconvenience/qeglpbuffer.cpp
+++ b/src/platformsupport/eglconvenience/qeglpbuffer.cpp
@@ -30,7 +30,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
+#include "qdatastream.h"
+#include "qtextstream.h"
 #include <QtGui/QOffscreenSurface>
 #include "qeglpbuffer_p.h"
 #include "qeglconvenience_p.h"
diff --git a/src/platformsupport/eglconvenience/qeglpbuffer_p.h b/src/platformsupport/eglconvenience/qeglpbuffer_p.h
index 81fdab8..3717d3a 100644
--- a/src/platformsupport/eglconvenience/qeglpbuffer_p.h
+++ b/src/platformsupport/eglconvenience/qeglpbuffer_p.h
@@ -45,9 +45,19 @@
 // We mean it.
 //
 
-#include <EGL/egl.h>
+#ifdef None
+#undef None
+#endif
+#ifdef KeyPress
+#undef KeyPress
+#endif
+#ifdef KeyRelease
+#undef KeyRelease
+#endif
 #include <qpa/qplatformoffscreensurface.h>
 #include <QtPlatformSupport/private/qeglplatformcontext_p.h>
+#include <EGL/egl.h>
+
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
index acd6197..d4db856 100644
--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
@@ -31,13 +31,13 @@
 **
 ****************************************************************************/
 
+#include <QDebug>
+#include <QOpenGLContext>
+#include <qpa/qplatformwindow.h>
+#include <QtPlatformHeaders/QEGLNativeContext>
 #include "qeglplatformcontext_p.h"
 #include "qeglconvenience_p.h"
 #include "qeglpbuffer_p.h"
-#include <qpa/qplatformwindow.h>
-#include <QOpenGLContext>
-#include <QtPlatformHeaders/QEGLNativeContext>
-#include <QDebug>
 
 #ifdef Q_OS_ANDROID
 #include <QtCore/private/qjnihelpers_p.h>
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
index 1ddcb3b..bea9982 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
@@ -31,6 +31,7 @@
 **
 ****************************************************************************/
 
+#include "qtextstream.h"
 #include "qeglfskmsegldeviceintegration.h"
 #include <QLoggingCategory>
 
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicemain.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicemain.cpp
index f987ae3..10175fb 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicemain.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicemain.cpp
@@ -30,7 +30,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
+#include "qtextstream.h"
 #include "qeglfskmsegldeviceintegration.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/eglfs/eglfs.pro b/src/plugins/platforms/eglfs/eglfs.pro
index 03c96ca..369980e 100644
--- a/src/plugins/platforms/eglfs/eglfs.pro
+++ b/src/plugins/platforms/eglfs/eglfs.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-
+CONFIG += debug
 SUBDIRS += eglfs_device_lib.pro
 SUBDIRS += eglfs-plugin.pro
 SUBDIRS += deviceintegration
diff --git a/src/plugins/platforms/eglfs/qeglfscontext.cpp b/src/plugins/platforms/eglfs/qeglfscontext.cpp
index 6fcdae7..f302f01 100644
--- a/src/plugins/platforms/eglfs/qeglfscontext.cpp
+++ b/src/plugins/platforms/eglfs/qeglfscontext.cpp
@@ -31,6 +31,8 @@
 **
 ****************************************************************************/
 
+#include "qdatastream.h"
+#include "qtextstream.h"
 #include <QtGui/QSurface>
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
 #include <QtPlatformSupport/private/qeglpbuffer_p.h>
diff --git a/src/plugins/platforms/eglfs/qeglfscursor.cpp b/src/plugins/platforms/eglfs/qeglfscursor.cpp
index eea130a..b9329ad 100644
--- a/src/plugins/platforms/eglfs/qeglfscursor.cpp
+++ b/src/plugins/platforms/eglfs/qeglfscursor.cpp
@@ -30,19 +30,19 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
+#include "qtextstream.h"
 #include "qeglfscursor.h"
+#include <QtCore/QJsonDocument>
+#include <QtGui/private/qguiapplication_p.h>
 #include "qeglfsintegration.h"
 #include "qeglfsscreen.h"
 
 #include <qpa/qwindowsysteminterface.h>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLShaderProgram>
-#include <QtCore/QJsonDocument>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
 
-#include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/private/qopenglvertexarrayobject_p.h>
 
 #ifndef GL_VERTEX_ARRAY_BINDING
diff --git a/src/plugins/platforms/eglfs/qeglfsdeviceintegration.cpp b/src/plugins/platforms/eglfs/qeglfsdeviceintegration.cpp
index 0c2aa7a..c201d03 100644
--- a/src/plugins/platforms/eglfs/qeglfsdeviceintegration.cpp
+++ b/src/plugins/platforms/eglfs/qeglfsdeviceintegration.cpp
@@ -30,7 +30,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
+#include "qtextstream.h"
 #include "qeglfsdeviceintegration.h"
 #include "qeglfsintegration.h"
 #include "qeglfscursor.h"
@@ -259,7 +259,6 @@ QSurfaceFormat QEGLDeviceIntegration::surfaceFormatFor(const QSurfaceFormat &inp
         format.setGreenBufferSize(8);
         format.setBlueBufferSize(8);
     }
-
     return format;
 }
 
diff --git a/src/plugins/platforms/eglfs/qeglfsdeviceintegration.h b/src/plugins/platforms/eglfs/qeglfsdeviceintegration.h
index d91d67d..3fa09da 100644
--- a/src/plugins/platforms/eglfs/qeglfsdeviceintegration.h
+++ b/src/plugins/platforms/eglfs/qeglfsdeviceintegration.h
@@ -53,6 +53,18 @@
 #include <EGL/egl.h>
 #include "qeglfsglobal.h"
 
+#ifdef Unsorted
+#undef Unsorted
+#endif
+
+#ifdef Bool
+#undef Bool
+#endif
+
+#ifdef None
+#undef None
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QPlatformSurface;
diff --git a/src/plugins/platforms/eglfs/qeglfshooks.cpp b/src/plugins/platforms/eglfs/qeglfshooks.cpp
index cf016d1..4b30f81 100644
--- a/src/plugins/platforms/eglfs/qeglfshooks.cpp
+++ b/src/plugins/platforms/eglfs/qeglfshooks.cpp
@@ -31,8 +31,8 @@
 **
 ****************************************************************************/
 
-#include "qeglfshooks.h"
 #include <QLoggingCategory>
+#include "qeglfshooks.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
index 2df06ca..e80d4e4 100644
--- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp
+++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
@@ -44,18 +44,19 @@
 #include <qpa/qwindowsysteminterface.h>
 #include <qpa/qplatforminputcontextfactory_p.h>
 
+#include <QtPlatformSupport/private/qevdevkeyboardmanager_p.h>
+#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
+#include "qeglfscursor.h"
 #include "qeglfsintegration.h"
 #include "qeglfswindow.h"
 #include "qeglfshooks.h"
 #include "qeglfscontext.h"
 #include "qeglfsoffscreenwindow.h"
-#include "qeglfscursor.h"
 
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
 #include <QtPlatformSupport/private/qeglplatformcontext_p.h>
 #include <QtPlatformSupport/private/qeglpbuffer_p.h>
 
-#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
 #include <QtPlatformSupport/private/qgenericunixservices_p.h>
 #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
 #include <QtPlatformSupport/private/qfbvthandler_p.h>
@@ -69,7 +70,6 @@
 
 #if !defined(QT_NO_EVDEV) && (!defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK))
 #include <QtPlatformSupport/private/qevdevmousemanager_p.h>
-#include <QtPlatformSupport/private/qevdevkeyboardmanager_p.h>
 #include <QtPlatformSupport/private/qevdevtouchmanager_p.h>
 #endif
 
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.h b/src/plugins/platforms/eglfs/qeglfsintegration.h
index 98c7ee9..729c5fa 100644
--- a/src/plugins/platforms/eglfs/qeglfsintegration.h
+++ b/src/plugins/platforms/eglfs/qeglfsintegration.h
@@ -41,6 +41,25 @@
 #include <EGL/egl.h>
 #include "qeglfsglobal.h"
 
+/*
+    Fix for the QT5 programming issue: conflict between #define CursorShape 0
+    in X.h (X11) & Qt::CursorShape, which resulted in compile errors.
+    Somehow the QT guys didnt catch this programming error.
+    [BUG:FIXME]: CursorShape isnt not restored later
+*/
+#ifdef CursorShape
+#undef CursorShape
+#endif
+
+#ifdef None
+#undef None
+#endif
+
+#ifdef Expose
+#undef Expose
+#endif
+
+
 QT_BEGIN_NAMESPACE
 
 class QEglFSWindow;
diff --git a/src/plugins/platforms/eglfs/qeglfsoffscreenwindow.cpp b/src/plugins/platforms/eglfs/qeglfsoffscreenwindow.cpp
index 0c07aa6..71f21a4 100644
--- a/src/plugins/platforms/eglfs/qeglfsoffscreenwindow.cpp
+++ b/src/plugins/platforms/eglfs/qeglfsoffscreenwindow.cpp
@@ -31,6 +31,8 @@
 **
 ****************************************************************************/
 
+#include "qdatastream.h"
+#include "qmetatype.h"
 #include "qeglfsoffscreenwindow.h"
 #include "qeglfshooks.h"
 #include <QtGui/QOffscreenSurface>
diff --git a/src/plugins/platforms/eglfs/qeglfsoffscreenwindow.h b/src/plugins/platforms/eglfs/qeglfsoffscreenwindow.h
index 9b8eaac..4c51ef6 100644
--- a/src/plugins/platforms/eglfs/qeglfsoffscreenwindow.h
+++ b/src/plugins/platforms/eglfs/qeglfsoffscreenwindow.h
@@ -38,6 +38,43 @@
 #include <qpa/qplatformoffscreensurface.h>
 #include "qeglfsglobal.h"
 
+#ifdef CursorShape
+#undef CursorShape
+#endif
+
+#ifdef None
+#undef None
+#endif
+
+#ifdef Expose
+#undef Expose
+#endif
+
+#ifdef KeyPress
+#undef KeyPress
+#endif
+
+#ifdef KeyRelease
+#undef KeyRelease
+#endif
+
+#ifdef FocusIn
+#undef FocusIn
+#endif
+
+#ifdef FocusOut
+#undef FocusOut
+#endif
+
+#ifdef FontChange
+#undef FontChange
+#endif
+
+#ifdef Bool
+#undef Bool
+#endif
+
+
 QT_BEGIN_NAMESPACE
 
 class Q_EGLFS_EXPORT QEglFSOffscreenWindow : public QPlatformOffscreenSurface
diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp
index 8301be8..162669a 100644
--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
@@ -32,6 +32,7 @@
 ****************************************************************************/
 
 #include <QtCore/qtextstream.h>
+#include "qeglfscursor.h"
 #include <qpa/qwindowsysteminterface.h>
 #include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
@@ -41,7 +42,6 @@
 #include <QtPlatformSupport/private/qopenglcompositorbackingstore_p.h>
 
 #include "qeglfswindow.h"
-#include "qeglfscursor.h"
 #include "qeglfshooks.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/minimalegl/qminimaleglintegration.h b/src/plugins/platforms/minimalegl/qminimaleglintegration.h
index 7a2c23c..01becc0 100644
--- a/src/plugins/platforms/minimalegl/qminimaleglintegration.h
+++ b/src/plugins/platforms/minimalegl/qminimaleglintegration.h
@@ -36,6 +36,10 @@
 
 #include "qminimaleglscreen.h"
 
+#ifdef None
+#undef None
+#endif
+
 #include <qpa/qplatformintegration.h>
 #include <qpa/qplatformscreen.h>
 
diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
index 2e088d3..5c51895 100644
--- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
@@ -1543,6 +1543,8 @@ void QXcbKeyboard::handleKeyEvent(xcb_window_t sourceWindow, QEvent::Type type,
     }
 }
 
+#include "/home/rbhagwat/data2/source/v4l_pdk/qt5-git/qt5/qtbase/src/3rdparty/xkbcommon/xkbcommon/xkbcommon.h"
+
 QString QXcbKeyboard::lookupString(struct xkb_state *state, xcb_keycode_t code) const
 {
     QVarLengthArray<char, 32> chars(32);
diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
index 1298756..5d7546b 100644
--- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro
+++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
@@ -105,6 +105,8 @@ contains(QT_CONFIG, xcb-qt) {
     !contains(DEFINES, QT_NO_XKB):LIBS += -lxcb-xkb
 }
 
+QT_CONFIG += use-xkbcommon-x11support
+include(../../../3rdparty/xkbcommon.pri)
 # libxkbcommon
 contains(QT_CONFIG, xkbcommon-qt) {
     QT_CONFIG += use-xkbcommon-x11support
diff --git a/src/tools/bootstrap-dbus/bootstrap-dbus.pro b/src/tools/bootstrap-dbus/bootstrap-dbus.pro
index fb06b4d..4a79831 100644
--- a/src/tools/bootstrap-dbus/bootstrap-dbus.pro
+++ b/src/tools/bootstrap-dbus/bootstrap-dbus.pro
@@ -9,6 +9,11 @@ DEFINES += \
 
 MODULE_INCLUDES = \
     \$\$QT_MODULE_INCLUDE_BASE/QtDBus
+
+MODULE_INCLUDES += /usr/include/dbus-1.0
+MODULE_INCLUDES += /usr/lib/i386-linux-gnu/dbus-1.0/include
+MODULE_INCLUDES += /usr/lib/x86_64-linux-gnu/dbus-1.0/include
+
 MODULE_PRIVATE_INCLUDES = \
     \$\$QT_MODULE_INCLUDE_BASE/QtDBus/$$QT_VERSION \
     \$\$QT_MODULE_INCLUDE_BASE/QtDBus/$$QT_VERSION/QtDBus
-- 
2.1.4