diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-09-26 15:59:22 +0300 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-09-26 13:25:32 +0000 |
| commit | e31debc0e7e5c1cb69d64163b3cecbf99b7fa9f2 (patch) | |
| tree | fbae7a5d531601bb1ee3efb27d8b6fec167e89ac | |
| parent | 57dc7f8468cb83488dec144f475f157132de9c08 (diff) | |
QmlDesigner: Move SearchBox to StudioControls
Fixes: QDS-7759
Change-Id: Idf33aa47f5e793c4053f825ae8a203b97c078bf1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml | 2 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml | 2 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml | 2 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/qmldir | 1 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SearchBox.qml (renamed from share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SearchBox.qml) | 0 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/qmldir | 1 |
6 files changed, 4 insertions, 4 deletions
diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml index d88b129794..eb6408a08f 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml @@ -436,7 +436,7 @@ Item { width: parent.width - SearchBox { + StudioControls.SearchBox { id: searchBox width: parent.width - addAssetButton.width - 5 diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml index 8a926e2273..1f7c8ad662 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml @@ -221,7 +221,7 @@ Item { Row { width: parent.width - SearchBox { + StudioControls.SearchBox { id: searchBox width: parent.width - addModuleButton.width - 5 diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml index 756a7a98a6..0e3b3a086a 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml @@ -230,7 +230,7 @@ Item { width: root.width enabled: !materialBrowserModel.hasMaterialRoot && materialBrowserModel.hasQuick3DImport - SearchBox { + StudioControls.SearchBox { id: searchBox width: root.width - addMaterialButton.width diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/qmldir b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/qmldir index 5a18d24846..f145b09877 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/qmldir +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/qmldir @@ -61,7 +61,6 @@ RoundedPanel 2.0 RoundedPanel.qml ScrollView 2.0 ScrollView.qml SecondColumnLayout 2.0 SecondColumnLayout.qml Section 2.0 Section.qml -SearchBox 2.0 SearchBox.qml SectionLayout 2.0 SectionLayout.qml Spacer 2.0 Spacer.qml SpinBox 2.0 SpinBox.qml diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SearchBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SearchBox.qml index 3b4f785faa..3b4f785faa 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SearchBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SearchBox.qml diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/qmldir b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/qmldir index 878b2307c3..fea940d878 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/qmldir +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/qmldir @@ -30,6 +30,7 @@ RealSpinBoxIndicator 1.0 RealSpinBoxIndicator.qml RealSpinBoxInput 1.0 RealSpinBoxInput.qml ScrollBar 1.0 ScrollBar.qml ScrollView 1.0 ScrollView.qml +SearchBox 1.0 SearchBox.qml SecondColumnLayout 1.0 SecondColumnLayout.qml Section 1.0 Section.qml SectionLabel 1.0 SectionLabel.qml |