Merge remote branch 'lighthouse/4.7' into lighthouse-master

Conflicts:
	src/opengl/qgl_p.h

12 files changed, 48 insertions, 18 deletions

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 81271db..e154566 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2615,7 +2615,7 @@ QT_LICENSED_MODULE(DBus)
 #endif
 
 #ifdef Q_OS_NACL
-#include <qnaclunimplemented.h>
+#include <QtCore/qnaclunimplemented.h>
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/corelib/global/qnaclunimplemented.h b/src/corelib/global/qnaclunimplemented.h
index 84085b5..ba43915 100644
--- a/src/corelib/global/qnaclunimplemented.h
+++ b/src/corelib/global/qnaclunimplemented.h
@@ -50,6 +50,10 @@
 #define PTHREAD_CANCEL_ENABLE 2
 #define PTHREAD_INHERIT_SCHED 3
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 extern "C" {
 
 void pthread_cleanup_push(void (*handler)(void *), void *arg);
@@ -80,6 +84,10 @@ int open64(const char *path, int oflag, ...);
 
 int select(int nfds, fd_set * readfds, fd_set * writefds, fd_set * errorfds, struct timeval * timeout);
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif //Q_OS_NACL
 
 #endif //QNACLUNIMPLEMENTED_H 
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 08f7184..4261e93 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -221,7 +221,8 @@ qpa {
                 kernel/qplatformwindowformat_qpa.h \
                 kernel/qplatformglcontext_qpa.h \
                 kernel/qdesktopwidget_qpa_p.h \
-                kernel/qplatformeventloopintegration_qpa.h
+                kernel/qplatformeventloopintegration_qpa.h \
+                kernel/qplatformcursor_qpa.h
 
 	SOURCES += \
 		kernel/qapplication_qpa.cpp \
@@ -242,7 +243,8 @@ qpa {
                 kernel/qplatformwindow_qpa.cpp \
                 kernel/qplatformwindowformat_qpa.cpp \
                 kernel/qplatformeventloopintegration_qpa.cpp \
-                kernel/qplatformglcontext_qpa.cpp
+                kernel/qplatformglcontext_qpa.cpp \
+                kernel/qplatformcursor_qpa.cpp
 
         contains(QT_CONFIG, glib) {
             SOURCES += \
diff --git a/src/gui/painting/qplatformcursor_qpa.cpp b/src/gui/kernel/qplatformcursor_qpa.cpp
index 6665396..6665396 100644
--- a/src/gui/painting/qplatformcursor_qpa.cpp
+++ b/src/gui/kernel/qplatformcursor_qpa.cpp
diff --git a/src/gui/painting/qplatformcursor_qpa.h b/src/gui/kernel/qplatformcursor_qpa.h
index 5f1654d..abdbfee 100644
--- a/src/gui/painting/qplatformcursor_qpa.h
+++ b/src/gui/kernel/qplatformcursor_qpa.h
@@ -41,16 +41,20 @@
 #ifndef QGRAPHICSSYSTEMCURSOR_H
 #define QGRAPHICSSYSTEMCURSOR_H
 
-#include <QList>
-#include <QImage>
-#include <QMouseEvent>
-#include <QWeakPointer>
-#include <QObject>
-#include <QPlatformScreen>
-#include <QCursor>
+#include <QtCore/QList>
+#include <QtGui/QImage>
+#include <QtGui/QMouseEvent>
+#include <QtCore/QWeakPointer>
+#include <QtCore/QObject>
+#include <QtGui/QPlatformScreen>
+#include <QtGui/QCursor>
+
+QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Gui)
+
 // Cursor graphics management
 class Q_GUI_EXPORT QPlatformCursorImage {
 public:
@@ -94,4 +98,6 @@ private:
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
 #endif // QGRAPHICSSYSTEMCURSOR_H
diff --git a/src/gui/kernel/qplatformeventloopintegration_qpa.h b/src/gui/kernel/qplatformeventloopintegration_qpa.h
index 5e4c227..7343566 100644
--- a/src/gui/kernel/qplatformeventloopintegration_qpa.h
+++ b/src/gui/kernel/qplatformeventloopintegration_qpa.h
@@ -1,7 +1,13 @@
 #ifndef QPLATFORMEVENTLOOPINTEGRATION_QPA_H
 #define QPLATFORMEVENTLOOPINTEGRATION_QPA_H
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
 
 class QPlatformEventLoopIntegration
 {
@@ -10,4 +16,8 @@ public:
     virtual void wakeup() = 0;
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif // QPLATFORMEVENTLOOPINTEGRATION_QPA_H
diff --git a/src/gui/kernel/qplatformglcontext_qpa.h b/src/gui/kernel/qplatformglcontext_qpa.h
index ff848ed..ed41723 100644
--- a/src/gui/kernel/qplatformglcontext_qpa.h
+++ b/src/gui/kernel/qplatformglcontext_qpa.h
@@ -43,12 +43,14 @@
 #define QPLATFORM_GL_CONTEXT_H
 
 #include <QtCore/qnamespace.h>
-#include <QPlatformWindowFormat>
+#include <QtGui/QPlatformWindowFormat>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Gui)
+
 class Q_OPENGL_EXPORT QPlatformGLContext
 {
 public:
diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration_qpa.h
index 8cecbb4..9460910 100644
--- a/src/gui/kernel/qplatformintegration_qpa.h
+++ b/src/gui/kernel/qplatformintegration_qpa.h
@@ -51,7 +51,8 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-//QT_MODULE(Gui)
+QT_MODULE(Gui)
+
 class QPlatformWindow;
 class QWindowSurface;
 class QBlittable;
diff --git a/src/gui/kernel/qplatformwindow_qpa.h b/src/gui/kernel/qplatformwindow_qpa.h
index 2275c02..6dfba05 100644
--- a/src/gui/kernel/qplatformwindow_qpa.h
+++ b/src/gui/kernel/qplatformwindow_qpa.h
@@ -52,6 +52,8 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Gui)
+
 class QPlatformWindowPrivate;
 class QWidget;
 class QPlatformGLContext;
diff --git a/src/gui/kernel/qplatformwindowformat_qpa.h b/src/gui/kernel/qplatformwindowformat_qpa.h
index 2d267d1..63df76a 100644
--- a/src/gui/kernel/qplatformwindowformat_qpa.h
+++ b/src/gui/kernel/qplatformwindowformat_qpa.h
@@ -47,6 +47,8 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Gui)
+
 class QPlatformWindowFormatPrivate;
 
 class Q_GUI_EXPORT QPlatformWindowFormat
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 1f76b6f..088ad42 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -188,10 +188,7 @@ embedded {
 qpa {
         SOURCES += \
                 painting/qcolormap_qpa.cpp \
-                painting/qpaintdevice_qpa.cpp \
-                painting/qplatformcursor_qpa.cpp
-        HEADERS += \
-                painting/qplatformcursor_qpa.h
+                painting/qpaintdevice_qpa.cpp
 }
 
 symbian {
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 32a257d..0a5c649 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -437,7 +437,7 @@ public:
     static inline QGLExtensionFuncs& extensionFuncs(const QGLContext *ctx) { return ctx->d_ptr->group->extensionFuncs(); }
 #endif
 
-#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_WS_QPA)) || defined(Q_OS_SYMBIAN)
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_WS_QPA) || defined(Q_OS_SYMBIAN) 
     static Q_OPENGL_EXPORT QGLExtensionFuncs qt_extensionFuncs;
     static Q_OPENGL_EXPORT QGLExtensionFuncs& extensionFuncs(const QGLContext *);
 #endif