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

Merge remote-tracking branch 'origin/2.7' into 2.8

Browse Source 
Conflicts:
	src/plugins/analyzerbase/analyzerbase.qbs
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qt4projectmanager/qt4projectmanager.qbs

Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11
This commit is contained in:
Eike Ziller
2013-05-28 18:28:00 +02:00
parent 60378b43bf 24e81241a5
commit 8d894aee02
43 changed files with 4350 additions and 1597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,8 +16,6 @@ QtcPlugin {
Depends { name: "QmlEditorWidgets" }
Depends { name: "CPlusPlus" }
Depends { name: "cpp" }
files: [
"QmlJSEditor.mimetypes.xml",
"jsfilewizard.cpp",