Merge remote-tracking branch 'origin/7.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I254066f8be63cb5b15650ef2a470206db56de026

src/plugins/qmldesigner/components/edit3d/edit3dview.cpp

@@ -67,16 +67,7 @@ void Edit3DView::createEdit3DWidget()
 
 void Edit3DView::checkImports()
 {
-    bool has3dImport = false;
-    const QList<Import> imports = model()->imports();
-    for (const auto &import : imports) {
-        if (import.url() == "QtQuick3D") {
-            has3dImport = true;
-            break;
-        }
-    }
-
-    edit3DWidget()->showCanvas(has3dImport);
+    edit3DWidget()->showCanvas(model()->hasImport("QtQuick3D"));
 }
 
 WidgetInfo Edit3DView::widgetInfo()