diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml index 9a8eda0a5e7..eb708a80872 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml @@ -96,7 +96,10 @@ Item { HelperWidgets.AbstractButton { style: StudioTheme.Values.viewBarButtonStyle buttonIcon: StudioTheme.Constants.add_medium - enabled: hasMaterial && hasModelSelection && hasQuick3DImport && hasMaterialLibrary + enabled: (this.hasMaterial ?? false) + && hasModelSelection + && hasQuick3DImport + && hasMaterialLibrary tooltip: qsTr("Add a custom bundle folder.") onClicked: ContentLibraryBackend.rootView.browseBundleFolder() x: 5 // left margin diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/BlurHelper.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/BlurHelper.qml index da68339603a..80577e932a1 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/BlurHelper.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/BlurHelper.qml @@ -20,8 +20,8 @@ Item { visible: false layer.enabled: true layer.smooth: true - vertexShader: g_propertyData.blur_vs_path - fragmentShader: g_propertyData.blur_fs_path + vertexShader: g_propertyData?.blur_vs_path ?? "" + fragmentShader: g_propertyData?.blur_fs_path ?? "" } QtObject { diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml index d8c36e34c22..920d02a304b 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml @@ -298,8 +298,8 @@ Column { BlurHelper { id: blurHelper source: source - property int blurMax: g_propertyData.blur_helper_max_level ? g_propertyData.blur_helper_max_level : 64 - property real blurMultiplier: g_propertyData.blurMultiplier ? g_propertyData.blurMultiplier : 0 + property int blurMax: g_propertyData?.blur_helper_max_level ?? 64 + property real blurMultiplier: g_propertyData?.blurMultiplier ?? 0 } Item { diff --git a/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Styles.qml b/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Styles.qml index 6e1467dd2f7..87c9f623536 100644 --- a/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Styles.qml +++ b/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Styles.qml @@ -132,7 +132,7 @@ Item { delegate: ItemDelegate { id: delegateId - readonly property string styleName: model.display + readonly property string styleName: model?.display ?? "" width: stylesList.width height: DialogValues.styleListItemHeight hoverEnabled: true @@ -180,7 +180,7 @@ Item { width: DialogValues.styleImageWidth height: DialogValues.styleImageHeight asynchronous: false - source: "image://newprojectdialog_library/" + model.iconName + source: model?.iconName ? "image://newprojectdialog_library/" + model.iconName : "" } } // Rectangle