• dt's avatar
    Merge remote branch 'origin/2.1' · 6b6d9871
    dt authored
    Conflicts:
    	share/qtcreator/templates/mobileapp/app.pro
    	share/qtcreator/templates/qmlapp/app.pro
    	src/plugins/cpptools/cpptools.pro
    6b6d9871
qtcreator.qdoc 278 KB