From cb2ec46c97484c32596c0ab61926f5b9f7900747 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 14 Apr 2022 17:41:22 +0200 Subject: [PATCH] QmlDesigner: Inject fake components into builtin module There are missing components in the qml types file. The fake.qmltypes file provides them as a workaround. Task-number: QDS-6763 Change-Id: I01a1727731517a9597e85019a8199375c001faef Reviewed-by: Thomas Hartmann --- .../qmldesigner/projectstorage/fake.qmltypes | 286 ++++++++++++++++++ .../qmldesigner/qmldesignerprojectmanager.cpp | 3 + 2 files changed, 289 insertions(+) create mode 100644 share/qtcreator/qmldesigner/projectstorage/fake.qmltypes diff --git a/share/qtcreator/qmldesigner/projectstorage/fake.qmltypes b/share/qtcreator/qmldesigner/projectstorage/fake.qmltypes new file mode 100644 index 00000000000..c3ab7b8283a --- /dev/null +++ b/share/qtcreator/qmldesigner/projectstorage/fake.qmltypes @@ -0,0 +1,286 @@ +import QtQuick.tooling 1.2 + + +Module { + +Component { + name: "Qt3DAnimation::QAnimationClipData" +} + +Component { + name: "QVector" +} + +Component { + name: "QVector" +} + +Component { + name: "QVector" +} + +Component { + name: "QVector" +} + +Component { + name: "QVector" +} + +Component { + name: "uint" +} + +Component { + name: "QGeometryView" +} + +Component { + name: "QMatrix3x3" +} + +Component { + name: "Qt3DRender::QLevelOfDetailBoundingSphere" +} + +Component { + name: "QImage" +} + +Component { + name: "qlonglong" +} + +Component { + name: "qulonglong" +} + +Component { + name: "Hits" +} + +Component { + name: "QAbstractTexture" +} + +Component { + name: "QBrush" +} + +Component { + name: "QDeclarativeListProperty" +} + +Component { + name: "QLocale" +} + +Component { + name: "QPen" +} + +Component { + name: "QGraphicsLayout" +} + +Component { + name: "QGraphicsEffect" +} + +Component { + name: "QGraphicsLayout" +} + +Component { + name: "QPalette" +} + +Component { + name: "QRegExp" +} + +Component { + name: "QRegExp" +} + +Component { + name: "QList" +} + +Component { + name: "QList" +} + +Component { + name: "QList" +} + +Component { + name: "QList" +} + +Component { + name: "QList" +} + +Component { + name: "QList" +} + +Component { + name: "QList" +} + +Component { + name: "QList" +} + +Component { + name: "QList" +} + +Component { + name: "QList" +} + +Component { + name: "QList" +} + +Component { + name: "QList" +} + +Component { + name: "QCameraFormat" +} + +Component { + name: "Features" +} + +Component { + name: "QVideoSink" +} + +Component { + name: "QVideoSink*" +} + +Component { + name: "QVideoFrameFormat::PixelFormat" +} + +Component { + name: "QV4::ExecutionEngine" +} + +Component { + name: "QSizePolicy" +} + +Component { + name: "QLinearGradient" +} + +Component { + name: "const QObject" +} + +Component { + name: "QPlatformDialogHelper::StandardButtons" +} + +Component { + name: "QPlatformDialogHelper::ButtonRole" +} + +Component { + name: "QScene2D::RenderPolicy" +} + +Component { + name: "QPlatformDialogHelper::ButtonLayout" +} + +Component { + name: "Keyboard_QMLTYPE_22" +} + +Component { + name: "ShadowInputControl_QMLTYPE_16" +} + +Component { + name: "ShadowInputControl_QMLTYPE_16" +} + +Component { + name: "const QPointingDevice" +} + +Component { + name: "QQuickHandlerPoint" +} + +Component { + name: "QQuick3DBounds3" +} + +Component { + name: "QPointingDevice::DeviceTypes" +} + +Component { + name: "TextureChannelMapping" +} + +Component { + name: "MorphTargetAttributes" +} + +Component { + name: "QQuick3DRenderStats" +} + +Component { + name: "QScxmlDataModel" +} + +Component { + name: "QTapReading::TapDirection" +} + +Component { + name: "QAmbientLightReading::LightLevel" +} + +Component { + name: "QQuickWebEngineScriptCollection" +} + +Component { + name: "QQuickWebEngineScriptCollection" +} + +Component { + name: "QOrientationReading::Orientation" +} + +Component { + name: "QScxmlCompiler::Loader" +} + +Component { + name: "QScxmlTableData" +} + +Component { + name: "QFileDialogOptions::FileDialogOptions" +} + +Component { + name: "QFontDialogOptions::FontDialogOptions" +} + +} diff --git a/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp b/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp index 2c382a2b8e6..c2561470190 100644 --- a/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp +++ b/src/plugins/qmldesigner/qmldesignerprojectmanager.cpp @@ -275,6 +275,9 @@ QStringList qmlTypes(::ProjectExplorer::Target *target) qmldirPaths.append(installDirectory + "/builtins.qmltypes"); qmldirPaths.append(installDirectory + "/jsroot.qmltypes"); + qmldirPaths.append( + Core::ICore::resourcePath("qmldesigner/projectstorage/fake.qmltypes").toString()); + return qmldirPaths; }