From d3e25481f94baee22cc8ec537804ddd9e4d80a4e Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Tue, 20 Mar 2012 15:35:15 +0100
Subject: [PATCH] Fix qbs project files

Change-Id: Iae72cd8f65779617dfa3ae03e9c894a95d151e81
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 src/libs/zeroconf/zeroconf.qbs        | 2 +-
 src/plugins/cpptools/cpptools.qbs     | 4 ++++
 src/plugins/qmljstools/qmljstools.qbs | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs
index f6415d0ee51..f999ba88eb8 100644
--- a/src/libs/zeroconf/zeroconf.qbs
+++ b/src/libs/zeroconf/zeroconf.qbs
@@ -14,7 +14,7 @@ DynamicLibrary {
     }
     Properties {
         condition: qbs.targetOS == "linux"
-        cpp.defines: [ "_GNU_SOURCE HAVE_IPV6", "USES_NETLINK", "HAVE_LINUX", "TARGET_OS_LINUX" ]
+        cpp.defines: [ "_GNU_SOURCE", "HAVE_IPV6", "USES_NETLINK", "HAVE_LINUX", "TARGET_OS_LINUX" ]
     }
 
     files: [
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 4608cffe8c9..ad132ef7560 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -106,5 +106,9 @@ QtcPlugin {
         "TypeHierarchyBuilder.cpp",
         "TypeHierarchyBuilder.h"
     ]
+
+    ProductModule {
+        Depends { name: "CPlusPlus" }
+    }
 }
 
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index 9c13cbbd1eb..a62978f0e41 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -58,7 +58,7 @@ QtcPlugin {
     ]
 
     ProductModule {
-        Depends { name: "CPlusPlus" }
+        Depends { name: "CppTools" }
         Depends { name: "QmlJSDebugClient" }
     }
 }