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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I37e550646f877b50693043894976a693ac22ad5e
This commit is contained in:
Eike Ziller
2013-07-11 08:02:41 +02:00
parent 113c5600c9 8b390350df
commit ab0c3da08f
25 changed files with 3577 additions and 1757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
import qbs.base 1.0
import qbs.fileinfo as FileInfo
import qbs.FileInfo
import "../QtcPlugin.qbs" as QtcPlugin
import "../../../qbs/defaults.js" as Defaults