From e3bdcb1d62c8de4f13dfbeac1635dd82e0be5dff Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Date: Tue, 27 Sep 2011 15:19:20 +0300
Subject: [PATCH] Use module prefixed include paths, avoids warnings in
 configure.

Change-Id: I081fa49073da532647836ddd1087c0f5fcf32775
Reviewed-on: http://codereview.qt-project.org/5634
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/gui/kernel/qplatformdrag_qpa.h         | 2 +-
 src/gui/kernel/qplatforminputcontext_qpa.h | 2 +-
 src/gui/kernel/qsurfaceformat.h            | 2 +-
 src/gui/opengl/qopengl.h                   | 2 +-
 src/widgets/kernel/qplatformmenu_qpa.h     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gui/kernel/qplatformdrag_qpa.h b/src/gui/kernel/qplatformdrag_qpa.h
index eac17ed2a6..958bcf42c6 100644
--- a/src/gui/kernel/qplatformdrag_qpa.h
+++ b/src/gui/kernel/qplatformdrag_qpa.h
@@ -42,7 +42,7 @@
 #ifndef QPLATFORMDRAG_H
 #define QPLATFORMDRAG_H
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext_qpa.h
index f4efc3e92d..8321c0a29c 100644
--- a/src/gui/kernel/qplatforminputcontext_qpa.h
+++ b/src/gui/kernel/qplatforminputcontext_qpa.h
@@ -42,7 +42,7 @@
 #ifndef QPLATFORMINPUTCONTEXT_H
 #define QPLATFORMINPUTCONTEXT_H
 
-#include <qinputpanel.h>
+#include <QtGui/qinputpanel.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/gui/kernel/qsurfaceformat.h b/src/gui/kernel/qsurfaceformat.h
index 5f657c9dc6..cdbd50740b 100644
--- a/src/gui/kernel/qsurfaceformat.h
+++ b/src/gui/kernel/qsurfaceformat.h
@@ -41,7 +41,7 @@
 #ifndef QSURFACEFORMAT_H
 #define QSURFACEFORMAT_H
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h
index cef4277d6b..6edec3c6c1 100644
--- a/src/gui/opengl/qopengl.h
+++ b/src/gui/opengl/qopengl.h
@@ -42,7 +42,7 @@
 #ifndef QOPENGL_H
 #define QOPENGL_H
 
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/kernel/qplatformmenu_qpa.h b/src/widgets/kernel/qplatformmenu_qpa.h
index 05b96c51d3..2c88b48cf4 100644
--- a/src/widgets/kernel/qplatformmenu_qpa.h
+++ b/src/widgets/kernel/qplatformmenu_qpa.h
@@ -42,8 +42,8 @@
 #ifndef QPLATFORMMENU_H
 #define QPLATFORMMENU_H
 
-#include <qglobal.h>
-#include <qpointer.h>
+#include <QtCore/qglobal.h>
+#include <QtCore/qpointer.h>
 #include <QtWidgets/qaction.h>
 
 QT_BEGIN_NAMESPACE