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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I31edd50b2301f4d9b64e1c7980c4ed371e00c2dc
This commit is contained in:
Ulf Hermann
2018-07-25 14:19:14 +02:00
parent babf038ce8 6bf5e71c43
commit 5b8989d017
7 changed files with 4697 additions and 6299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@ QtcPlugin {
]
}
Depends { name: "qbs resources" }
Depends { name: "qbs resources"; condition: updateQmlTypeInfo }
Rule {
condition: updateQmlTypeInfo
inputsFromDependencies: ["qbs qml type descriptions", "qbs qml type bundle"]