From e0b31be804d7ffecb1f796f5111e422aa7e18f15 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Fri, 31 Oct 2014 13:57:13 +0100
Subject: [PATCH] Qt includes: Include qglobal.h when using QT_VERSION
Task-number: QTCREATORBUG-13280
Change-Id: I81cfe7875b1c7a1f16c13b49fe56849210db3acd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/libs/utils/codegeneration.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/libs/utils/codegeneration.cpp b/src/libs/utils/codegeneration.cpp
index 5b1ac3e9f3a..379eeba2009 100644
--- a/src/libs/utils/codegeneration.cpp
+++ b/src/libs/utils/codegeneration.cpp
@@ -117,6 +117,12 @@ void writeQtIncludeSection(const QStringList &qt4,
QSet<QString> common = qt4Only;
common.intersect(qt5Only);
+ // qglobal.h is needed for QT_VERSION
+ if (includeQtModule)
+ common.insert(QLatin1String("QtCore/qglobal.h"));
+ else
+ common.insert(QLatin1String("qglobal.h"));
+
qt4Only.subtract(common);
qt5Only.subtract(common);
--
GitLab