Merge remote-tracking branch 'origin/4.2'

Change-Id: I259a402bc896fc2e359cc96b7510453ac9a9a552
This commit is contained in:
Orgad Shaneh
2016-11-28 15:27:51 +02:00
128 changed files with 3030 additions and 1713 deletions

View File

@@ -46,9 +46,6 @@ void QmlProfilerAttachDialogTest::testAccessors()
dialog.setPort(4444);
QCOMPARE(dialog.port(), 4444);
ProjectExplorer::Kit *kit = dialog.kit();
QVERIFY(kit);
ProjectExplorer::Kit *newKit = new ProjectExplorer::Kit("dings");
ProjectExplorer::KitManager *kitManager = ProjectExplorer::KitManager::instance();
QVERIFY(kitManager);