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

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
This commit is contained in:
Eike Ziller
2013-03-18 10:19:14 +01:00
parent 7a107e7d00 e1aa322258
commit 99b2eb1ca9
48 changed files with 227 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/help/help.qbs
View File

@@ -21,11 +21,15 @@ QtcPlugin {
Depends { name: "app_version_header" }
Depends { name: "cpp" }
Properties {
condition: qtcore.versionMajor >= 5
cpp.defines: base.concat(["QT_NO_WEBKIT"])
cpp.defines: {
var list = base;
if (qtcore.versionMajor >= 5)
list.push("QT_NO_WEBKIT");
list.push("QT_CLUCENE_SUPPORT");
return list;
}
cpp.defines: base.concat("QT_CLUCENE_SUPPORT")
cpp.includePaths: base.concat("../../shared/help")
files: [