qtcreator.pri · 4ffc1a2f1059b7c0d7fb93088372e5a3fbbbaecb · Marco Bubke / flatpak-qt-creator

12 years ago

Merge remote-tracking branch 'origin/2.6' · 387f5a70

Eike Ziller authored 12 years ago

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63

387f5a70

History

Merge remote-tracking branch 'origin/2.6'

Eike Ziller authored 12 years ago

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63

qtcreator.pri 4.98 KiB