forked from qt-creator/qt-creator
35bb61590d
Conflicts: doc/qtcreator.qdoc share/qtcreator/templates/mobileapp/app.pro
Conflicts: doc/qtcreator.qdoc share/qtcreator/templates/mobileapp/app.pro