-
Eike Ziller authored
Conflicts: src/plugins/qt4projectmanager/wizards/qtquickapp.cpp Change-Id: I6ece61c73bc32e93912ad1b489871c597ab60d5b
a8c524d4
Conflicts: src/plugins/qt4projectmanager/wizards/qtquickapp.cpp Change-Id: I6ece61c73bc32e93912ad1b489871c597ab60d5b