From d1b4857d1718ef50dba64c8700253fed5d187ab2 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sun, 10 Mar 2013 13:34:52 -0700
Subject: Make sure that we #include qconfig.h before testing for features.

This is mandatory in public headers (qiodevice.h, qopengl*, etc.), but
it's a good idea even in private headers, in case someone includes
that header first somewhere. In particular, all platformsupport API is
private.

Change-Id: If287baa5d9ed14e93c1666efa0e6332c4c1cd9a4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 src/corelib/io/qiodevice.h              | 1 +
 src/corelib/kernel/qfunctions_nacl.h    | 2 ++
 src/corelib/kernel/qfunctions_vxworks.h | 3 +++
 src/corelib/kernel/qfunctions_wince.h   | 3 +++
 src/corelib/kernel/qtimer.h             | 2 ++
 src/corelib/tools/qregexp.h             | 2 ++
 src/corelib/tools/qregularexpression.h  | 2 ++
 7 files changed, 15 insertions(+)

(limited to 'src/corelib')

diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h
index 39c2d70492..cdc90f21bb 100644
--- a/src/corelib/io/qiodevice.h
+++ b/src/corelib/io/qiodevice.h
@@ -42,6 +42,7 @@
 #ifndef QIODEVICE_H
 #define QIODEVICE_H
 
+#include <QtCore/qglobal.h>
 #ifndef QT_NO_QOBJECT
 #include <QtCore/qobject.h>
 #else
diff --git a/src/corelib/kernel/qfunctions_nacl.h b/src/corelib/kernel/qfunctions_nacl.h
index f40807a0d9..c15b9756d0 100644
--- a/src/corelib/kernel/qfunctions_nacl.h
+++ b/src/corelib/kernel/qfunctions_nacl.h
@@ -42,6 +42,8 @@
 #ifndef QFUNCTIONS_NACL_H
 #define QFUNCTIONS_NACL_H
 
+#include <QtCore/qglobal.h>
+
 #ifdef Q_OS_NACL
 
 #include <sys/types.h>
diff --git a/src/corelib/kernel/qfunctions_vxworks.h b/src/corelib/kernel/qfunctions_vxworks.h
index 02c599f490..e33401a86a 100644
--- a/src/corelib/kernel/qfunctions_vxworks.h
+++ b/src/corelib/kernel/qfunctions_vxworks.h
@@ -41,6 +41,9 @@
 
 #ifndef QFUNCTIONS_VXWORKS_H
 #define QFUNCTIONS_VXWORKS_H
+
+#include <QtCore/qglobal.h>
+
 #ifdef Q_OS_VXWORKS
 
 #include <unistd.h>
diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h
index 4eeb9cff6a..ab7bbe3f99 100644
--- a/src/corelib/kernel/qfunctions_wince.h
+++ b/src/corelib/kernel/qfunctions_wince.h
@@ -41,6 +41,9 @@
 
 #ifndef QFUNCTIONS_WINCE_H
 #define QFUNCTIONS_WINCE_H
+
+#include <QtCore/qglobal.h>
+
 #ifdef Q_OS_WINCE
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h
index 34bfff9089..3484f4dba8 100644
--- a/src/corelib/kernel/qtimer.h
+++ b/src/corelib/kernel/qtimer.h
@@ -42,6 +42,8 @@
 #ifndef QTIMER_H
 #define QTIMER_H
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_QOBJECT
 
 #include <QtCore/qbasictimer.h> // conceptual inheritance
diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h
index acf59d7196..26b0b78317 100644
--- a/src/corelib/tools/qregexp.h
+++ b/src/corelib/tools/qregexp.h
@@ -42,6 +42,8 @@
 #ifndef QREGEXP_H
 #define QREGEXP_H
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_REGEXP
 
 #include <QtCore/qstring.h>
diff --git a/src/corelib/tools/qregularexpression.h b/src/corelib/tools/qregularexpression.h
index 97dbee9256..5059ea6431 100644
--- a/src/corelib/tools/qregularexpression.h
+++ b/src/corelib/tools/qregularexpression.h
@@ -43,6 +43,8 @@
 #ifndef QREGULAREXPRESSION_H
 #define QREGULAREXPRESSION_H
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_REGULAREXPRESSION
 
 #include <QtCore/qstring.h>
-- 
cgit v1.2.3