Merge remote-tracking branch 'origin/2.8'
Conflicts: src/plugins/cpptools/cppcompletion_test.cpp src/plugins/cpptools/cpptoolsplugin.h src/plugins/projectexplorer/customtoolchain.cpp src/plugins/vcsbase/command.cpp Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
Showing
dist/changes-2.8.1
0 → 100644
5.06 KB
5.98 KB
10.7 KB
39.8 KB
doc/images/qtcreator-android-manifest.png
100644 → 100755

7.68 KB
doc/images/qtcreator-android-sign-package.png
100644 → 100755

This diff is collapsed.