From 618115c3cd05f616a6298a80d4014cb179a8fd7c Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgads@gmail.com>
Date: Thu, 5 Jul 2012 11:05:30 +0300
Subject: [PATCH] Fix qbs build

Change-Id: If532d1498fecdf07fa5f5743b90528f0dd2eab9d
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 src/plugins/android/android.qbs     |  2 ++
 src/plugins/qtsupport/qtsupport.qbs | 33 ++++++++++++++++-------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index 23f5e074e48..d719b78309e 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -41,6 +41,8 @@ QtcPlugin {
         "androiddeploystepwidget.cpp",
         "androiddeploystepwidget.h",
         "androiddeploystepwidget.ui",
+        "androiddevice.cpp",
+        "androiddevice.h",
         "androiddevicefactory.cpp",
         "androiddevicefactory.h",
         "androidglobal.h",
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index a60f22490a2..708b4f2d7df 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -23,24 +23,30 @@ QtcPlugin {
     cpp.defines: {
         return base.concat([
             "QT_NO_CAST_TO_ASCII",
-            "PROPARSER_AS_LIBRARY",
-            "PROPARSER_LIBRARY",
-            "PROPARSER_THREAD_SAFE",
+            "QMAKE_AS_LIBRARY",
+            "QMAKE_LIBRARY",
             "PROEVALUATOR_THREAD_SAFE",
-            "PROEVALUATOR_CUMULATIVE"
+            "PROEVALUATOR_CUMULATIVE",
+            "QMAKE_BUILTIN_PRFS"
         ])
     }
 
     files: [
-        "../../shared/proparser/proparser_global.h",
-        "../../shared/proparser/profileparser.h",
-        "../../shared/proparser/profileevaluator.h",
-        "../../shared/proparser/proitems.h",
-        "../../shared/proparser/prowriter.h",
-        "../../shared/proparser/profileparser.cpp",
+        "../../shared/proparser/qmakebuiltins.cpp",
+        "../../shared/proparser/qmakeevaluator.cpp",
+        "../../shared/proparser/qmakeevaluator.h",
+        "../../shared/proparser/qmakeevaluator_p.h",
+        "../../shared/proparser/qmakeglobals.cpp",
+        "../../shared/proparser/qmakeglobals.h",
+        "../../shared/proparser/qmakeparser.cpp",
+        "../../shared/proparser/qmakeparser.h",
+        "../../shared/proparser/qmake_global.h",
         "../../shared/proparser/profileevaluator.cpp",
+        "../../shared/proparser/profileevaluator.h",
         "../../shared/proparser/proitems.cpp",
+        "../../shared/proparser/proitems.h",
         "../../shared/proparser/prowriter.cpp",
+        "../../shared/proparser/prowriter.h",
         "../../shared/proparser/proparser.qrc",
         "../../shared/proparser/ioutils.h",
         "../../shared/proparser/ioutils.cpp",
@@ -96,12 +102,9 @@ QtcPlugin {
         Depends { name: "cpp" }
         cpp.includePaths: [ "../../shared" ]
         cpp.defines: [
-            "PROPARSER_AS_LIBRARY",
-            "PROPARSER_LIBRARY",
-            "PROPARSER_THREAD_SAFE",
+            "QMAKE_AS_LIBRARY",
             "PROEVALUATOR_THREAD_SAFE",
-            "PROEVALUATOR_CUMULATIVE"
+            "QMAKE_BUILTIN_PRFS"
         ]
     }
 }
-