From 629e05ea1b9548367b64e7649f8ae501d2ce24d3 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Wed, 27 Mar 2013 20:35:48 +0100
Subject: [PATCH] add missing defines to QtSupport ProductModule and rely on
their presence
Change-Id: I21b14aa75928f35d35853f6d93e8bd58a653153b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
src/plugins/qt4projectmanager/qt4projectmanager.qbs | 6 ------
src/plugins/qtsupport/qtsupport.qbs | 2 ++
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index 1aee5b998bd..3f214bfbdaa 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -17,12 +17,6 @@ QtcPlugin {
Depends { name: "QmlJSTools" }
Depends { name: "cpp" }
- cpp.defines: base.concat([
- "PROPARSER_AS_LIBRARY",
- "PROPARSER_THREAD_SAFE",
- "PROEVALUATOR_THREAD_SAFE",
- "PROEVALUATOR_CUMULATIVE"
- ])
cpp.includePaths: base.concat([
"customwidgetwizard",
"../../shared",
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index ef460669f9e..d38f0c47f63 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -108,6 +108,8 @@ QtcPlugin {
cpp.includePaths: "../../shared"
cpp.defines: [
"QMAKE_AS_LIBRARY",
+ "PROPARSER_THREAD_SAFE",
+ "PROEVALUATOR_CUMULATIVE",
"PROEVALUATOR_THREAD_SAFE",
"QMAKE_BUILTIN_PRFS",
"PROEVALUATOR_SETENV"
--
GitLab