From 35380afb93c4899e4b265ce968cd727c8a46f906 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 30 Nov 2020 17:28:37 +0100 Subject: [PATCH] QmlDesigner: Disable rich text for TextInput TextInput does not support rich text. Task-number: QDS-2769 Change-Id: I6ae9862f65c866cce2975f7f53cb2683f41f0d9a Reviewed-by: Alessandro Portale --- .../propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml | 1 + .../propertyEditorQmlSources/QtQuick/TextSpecifics.qml | 1 + .../imports/HelperWidgets/StandardTextSection.qml | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml index 6a09b44a29c..2703191cda0 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextEditSpecifics.qml @@ -34,6 +34,7 @@ Column { StandardTextSection { showVerticalAlignment: true showFormatProperty: true + richTextEditorAvailable: true } Section { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml index 7b79e76f0c3..96a36c16b18 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextSpecifics.qml @@ -37,6 +37,7 @@ Column { showElide: true showFontSizeMode: true showLineHeight: true + richTextEditorAvailable: true } Section { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml index c15f1268113..cbd6fe9d650 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml @@ -40,6 +40,8 @@ Section { property bool showFormatProperty: false property bool showFontSizeMode: false property bool showLineHeight: false + property bool richTextEditorAvailable: false + id: root SectionLayout { @@ -61,9 +63,10 @@ Section { onClicked: { richTextDialogLoader.show() } + visible: root.richTextEditorAvailable } - RichTextEditor{ + RichTextEditor { onRejected: { hideWidget() }