-
Eike Ziller authored
Conflicts: qtcreator.qbp src/libs/QtcLibrary.qbs src/plugins/QtcPlugin.qbs src/tools/QtcTool.qbs Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
b947861c
Conflicts: qtcreator.qbp src/libs/QtcLibrary.qbs src/plugins/QtcPlugin.qbs src/tools/QtcTool.qbs Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5