From cb93846367066ab45ec479066ff5cf22ce2a4126 Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Mon, 23 May 2022 20:32:43 +0300 Subject: [PATCH] QmlDesigner: Clear components view search box upon load i.e. upon changing from edit mode to QDS mode. This also removed a warning. Change-Id: Ibd3ee3bd30febfcee9a05cb87047e79b8ed1bf61 Reviewed-by: Reviewed-by: Miikka Heikkinen --- .../qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml | 2 +- .../qmldesigner/itemLibraryQmlSources/ItemsView.qml | 6 ++++++ .../materialBrowserQmlSource/MaterialBrowser.qml | 2 +- .../imports/HelperWidgets/SearchBox.qml | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml index 54290223aa6..b63280b3681 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml @@ -48,7 +48,7 @@ Item { function clearSearchFilter() { - searchBox.text = ""; + searchBox.clear(); } function updateDropExtFiles(drag) diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml index 4771127ab82..ae39fdb5e3e 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml @@ -91,6 +91,12 @@ Item { itemContextMenu.close() } + // Called from C++ + function clearSearchFilter() + { + searchBox.clear(); + } + // Called also from C++ function switchToComponentsView() { diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml index 3fdc9cffdac..1518e477e39 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml @@ -56,7 +56,7 @@ Item { // Called from C++ function clearSearchFilter() { - searchBox.clearSearchFilter(); + searchBox.clear(); } MouseArea { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SearchBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SearchBox.qml index d1b6001bcf6..8f0079249db 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SearchBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SearchBox.qml @@ -33,7 +33,7 @@ Item { property alias text: searchFilterText.text - function clearSearchFilter() + function clear() { searchFilterText.text = ""; }