summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-03-10 13:34:52 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-19 07:02:57 +0100
commitd1b4857d1718ef50dba64c8700253fed5d187ab2 (patch)
treebbf5dd9904bd1f0188929d57279dd7d8bc8b3470 /src/corelib/tools
parenta1bc48422fc898496fe9e7e75f0ed74522cd18bc (diff)
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>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qregexp.h2
-rw-r--r--src/corelib/tools/qregularexpression.h2
2 files changed, 4 insertions, 0 deletions
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>