From f7afe3ee4b076049cea0d427b213ad848fcfb9c2 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Wed, 3 Jun 2009 11:10:04 +0200
Subject: [PATCH] Made the C++ front-end more Creator-friendly.

---
 src/libs/cplusplus/cplusplus-lib.pri                | 2 +-
 src/libs/cplusplus/cplusplus.pri                    | 1 -
 src/shared/cplusplus/CPlusPlusForwardDeclarations.h | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
index 0d36b052682..3720d7f6ef1 100644
--- a/src/libs/cplusplus/cplusplus-lib.pri
+++ b/src/libs/cplusplus/cplusplus-lib.pri
@@ -1,4 +1,4 @@
-DEFINES += HAVE_QT CPLUSPLUS_WITH_NAMESPACE CPLUSPLUS_BUILD_LIB
+DEFINES += CPLUSPLUS_BUILD_LIB
 INCLUDEPATH += $$PWD
 
 include(../../shared/cplusplus/cplusplus.pri)
diff --git a/src/libs/cplusplus/cplusplus.pri b/src/libs/cplusplus/cplusplus.pri
index e0cdf8900f0..0b8fac85fe3 100644
--- a/src/libs/cplusplus/cplusplus.pri
+++ b/src/libs/cplusplus/cplusplus.pri
@@ -1,3 +1,2 @@
 INCLUDEPATH += $$PWD/../../shared/cplusplus
-DEFINES += HAVE_QT CPLUSPLUS_WITH_NAMESPACE
 LIBS *= -l$$qtLibraryTarget(CPlusPlus)
diff --git a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h b/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
index d04147ad874..29d30428c74 100644
--- a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
+++ b/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
@@ -49,7 +49,7 @@
 #ifndef CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H
 #define CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H
 
-#ifdef HAVE_QT
+#ifndef CPLUSPLUS_WITH_NO_QT
 #  include <QtCore/qglobal.h>
 #  define CPLUSPLUS_BEGIN_HEADER
 #  define CPLUSPLUS_END_HEADER
@@ -58,6 +58,7 @@
 #  else
 #    define CPLUSPLUS_EXPORT Q_DECL_IMPORT
 #  endif
+#  define CPLUSPLUS_WITH_NAMESPACE
 #else
 #  define CPLUSPLUS_BEGIN_HEADER
 #  define CPLUSPLUS_END_HEADER
-- 
GitLab