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

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	qtcreator.pri
	src/libs/utils/utils.qbs
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qmljsinspector/qmljsinspector.qbs

Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
This commit is contained in:
Oswald Buddenhagen
2012-04-19 16:13:09 +02:00
parent c863662bb2 ca516cf31d
commit 822233629d
99 changed files with 2757 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/coreplugin/coreplugin.qbs
View File

@@ -245,13 +245,14 @@ QtcPlugin {
}
ProductModule {
Depends { name: "cpp" }
Depends { name: "Aggregation" }
Depends { name: "ExtensionSystem" }
Depends { name: "Utils" }
cpp.includePaths: [
"../..",
"../../libs",
buildDirectory + "/.obj/Core/actionmanager"
product.buildDirectory + "/.obj/Core/actionmanager"
]
}
}