Merge remote-tracking branch 'origin/2.8'
Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
src/app/app.qbs
0 → 100644
src/libs/libs.qbs
0 → 100644
Please register or sign in to comment