feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix qbs build

Browse Source 
Change-Id: If532d1498fecdf07fa5f5743b90528f0dd2eab9d
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-07-05 11:05:30 +03:00
committed by Joerg Bornemann
parent 9fb9a94eba
commit 618115c3cd
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/android.qbs
View File

@@ -41,6 +41,8 @@ QtcPlugin {
"androiddeploystepwidget.cpp", "androiddeploystepwidget.cpp",
"androiddeploystepwidget.h", "androiddeploystepwidget.h",
"androiddeploystepwidget.ui", "androiddeploystepwidget.ui",
"androiddevice.cpp",
"androiddevice.h",
"androiddevicefactory.cpp", "androiddevicefactory.cpp",
"androiddevicefactory.h", "androiddevicefactory.h",
"androidglobal.h", "androidglobal.h",

33
src/plugins/qtsupport/qtsupport.qbs
View File

@@ -23,24 +23,30 @@ QtcPlugin {
cpp.defines: { cpp.defines: {
return base.concat([ return base.concat([
"QT_NO_CAST_TO_ASCII", "QT_NO_CAST_TO_ASCII",
"PROPARSER_AS_LIBRARY", "QMAKE_AS_LIBRARY",
"PROPARSER_LIBRARY", "QMAKE_LIBRARY",
"PROPARSER_THREAD_SAFE",
"PROEVALUATOR_THREAD_SAFE", "PROEVALUATOR_THREAD_SAFE",
"PROEVALUATOR_CUMULATIVE" "PROEVALUATOR_CUMULATIVE",
"QMAKE_BUILTIN_PRFS"
]) ])
} }
files: [ files: [
"../../shared/proparser/proparser_global.h", "../../shared/proparser/qmakebuiltins.cpp",
"../../shared/proparser/profileparser.h", "../../shared/proparser/qmakeevaluator.cpp",
"../../shared/proparser/profileevaluator.h", "../../shared/proparser/qmakeevaluator.h",
"../../shared/proparser/proitems.h", "../../shared/proparser/qmakeevaluator_p.h",
"../../shared/proparser/prowriter.h", "../../shared/proparser/qmakeglobals.cpp",
"../../shared/proparser/profileparser.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.cpp",
"../../shared/proparser/profileevaluator.h",
"../../shared/proparser/proitems.cpp", "../../shared/proparser/proitems.cpp",
"../../shared/proparser/proitems.h",
"../../shared/proparser/prowriter.cpp", "../../shared/proparser/prowriter.cpp",
"../../shared/proparser/prowriter.h",
"../../shared/proparser/proparser.qrc", "../../shared/proparser/proparser.qrc",
"../../shared/proparser/ioutils.h", "../../shared/proparser/ioutils.h",
"../../shared/proparser/ioutils.cpp", "../../shared/proparser/ioutils.cpp",
@@ -96,12 +102,9 @@ QtcPlugin {
Depends { name: "cpp" } Depends { name: "cpp" }
cpp.includePaths: [ "../../shared" ] cpp.includePaths: [ "../../shared" ]
cpp.defines: [ cpp.defines: [
"PROPARSER_AS_LIBRARY", "QMAKE_AS_LIBRARY",
"PROPARSER_LIBRARY",
"PROPARSER_THREAD_SAFE",
"PROEVALUATOR_THREAD_SAFE", "PROEVALUATOR_THREAD_SAFE",
"PROEVALUATOR_CUMULATIVE" "QMAKE_BUILTIN_PRFS"
] ]
} }
} }