From 737767e5c43b4f1ede5efe6d91a1425f0cfa0c81 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 26 May 2025 12:07:45 +0200 Subject: [PATCH] QmlDesigner: Move qmldesignerutils to QmlDesignerBase The utils are needed in the qml build system. Change-Id: Icbe8a48d846d6dc09509aa4287dddf92573e0be0 Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/libs/CMakeLists.txt | 1 - src/plugins/qmldesignerbase/CMakeLists.txt | 2 ++ src/plugins/qmldesignerbase/libs/CMakeLists.txt | 1 + .../libs/qmldesignerutils/CMakeLists.txt | 0 .../libs/qmldesignerutils/asset.cpp | 0 .../libs/qmldesignerutils/asset.h | 0 .../libs/qmldesignerutils/designeralgorithm.h | 0 .../libs/qmldesignerutils/filedownloader.cpp | 0 .../libs/qmldesignerutils/filedownloader.h | 0 .../libs/qmldesignerutils/fileextractor.cpp | 0 .../libs/qmldesignerutils/fileextractor.h | 0 .../libs/qmldesignerutils/hdrimage.cpp | 0 .../libs/qmldesignerutils/hdrimage.h | 0 .../libs/qmldesignerutils/imageutils.cpp | 0 .../libs/qmldesignerutils/imageutils.h | 0 .../libs/qmldesignerutils/importutils.cpp | 0 .../libs/qmldesignerutils/importutils.h | 0 .../libs/qmldesignerutils/ktximage.cpp | 0 .../libs/qmldesignerutils/ktximage.h | 0 .../libs/qmldesignerutils/maputils.h | 0 .../libs/qmldesignerutils/memory.h | 0 .../libs/qmldesignerutils/multifiledownloader.cpp | 0 .../libs/qmldesignerutils/multifiledownloader.h | 0 .../libs/qmldesignerutils/qmldesignerutils_global.h | 0 .../libs/qmldesignerutils/stringutils.cpp | 0 .../libs/qmldesignerutils/stringutils.h | 0 .../libs/qmldesignerutils/version.cpp | 0 .../libs/qmldesignerutils/version.h | 0 28 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 src/plugins/qmldesignerbase/libs/CMakeLists.txt rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/CMakeLists.txt (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/asset.cpp (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/asset.h (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/designeralgorithm.h (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/filedownloader.cpp (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/filedownloader.h (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/fileextractor.cpp (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/fileextractor.h (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/hdrimage.cpp (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/hdrimage.h (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/imageutils.cpp (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/imageutils.h (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/importutils.cpp (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/importutils.h (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/ktximage.cpp (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/ktximage.h (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/maputils.h (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/memory.h (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/multifiledownloader.cpp (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/multifiledownloader.h (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/qmldesignerutils_global.h (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/stringutils.cpp (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/stringutils.h (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/version.cpp (100%) rename src/plugins/{qmldesigner => qmldesignerbase}/libs/qmldesignerutils/version.h (100%) diff --git a/src/plugins/qmldesigner/libs/CMakeLists.txt b/src/plugins/qmldesigner/libs/CMakeLists.txt index be2d12733cb..149176578d1 100644 --- a/src/plugins/qmldesigner/libs/CMakeLists.txt +++ b/src/plugins/qmldesigner/libs/CMakeLists.txt @@ -1,3 +1,2 @@ add_subdirectory(designercore) -add_subdirectory(qmldesignerutils) add_subdirectory(designsystem) diff --git a/src/plugins/qmldesignerbase/CMakeLists.txt b/src/plugins/qmldesignerbase/CMakeLists.txt index aa1a89da4b3..f2ae3bc48d3 100644 --- a/src/plugins/qmldesignerbase/CMakeLists.txt +++ b/src/plugins/qmldesignerbase/CMakeLists.txt @@ -67,3 +67,5 @@ else () target_link_libraries(QmlDesignerBase PRIVATE -Wl,--whole-archive $ -Wl,--no-whole-archive) endif () endif () + +add_subdirectory(libs) diff --git a/src/plugins/qmldesignerbase/libs/CMakeLists.txt b/src/plugins/qmldesignerbase/libs/CMakeLists.txt new file mode 100644 index 00000000000..30995f39b7a --- /dev/null +++ b/src/plugins/qmldesignerbase/libs/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(qmldesignerutils) diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/CMakeLists.txt b/src/plugins/qmldesignerbase/libs/qmldesignerutils/CMakeLists.txt similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/CMakeLists.txt rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/CMakeLists.txt diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/asset.cpp b/src/plugins/qmldesignerbase/libs/qmldesignerutils/asset.cpp similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/asset.cpp rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/asset.cpp diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/asset.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/asset.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/asset.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/asset.h diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/designeralgorithm.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/designeralgorithm.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/designeralgorithm.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/designeralgorithm.h diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/filedownloader.cpp b/src/plugins/qmldesignerbase/libs/qmldesignerutils/filedownloader.cpp similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/filedownloader.cpp rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/filedownloader.cpp diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/filedownloader.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/filedownloader.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/filedownloader.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/filedownloader.h diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/fileextractor.cpp b/src/plugins/qmldesignerbase/libs/qmldesignerutils/fileextractor.cpp similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/fileextractor.cpp rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/fileextractor.cpp diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/fileextractor.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/fileextractor.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/fileextractor.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/fileextractor.h diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/hdrimage.cpp b/src/plugins/qmldesignerbase/libs/qmldesignerutils/hdrimage.cpp similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/hdrimage.cpp rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/hdrimage.cpp diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/hdrimage.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/hdrimage.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/hdrimage.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/hdrimage.h diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/imageutils.cpp b/src/plugins/qmldesignerbase/libs/qmldesignerutils/imageutils.cpp similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/imageutils.cpp rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/imageutils.cpp diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/imageutils.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/imageutils.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/imageutils.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/imageutils.h diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/importutils.cpp b/src/plugins/qmldesignerbase/libs/qmldesignerutils/importutils.cpp similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/importutils.cpp rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/importutils.cpp diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/importutils.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/importutils.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/importutils.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/importutils.h diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/ktximage.cpp b/src/plugins/qmldesignerbase/libs/qmldesignerutils/ktximage.cpp similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/ktximage.cpp rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/ktximage.cpp diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/ktximage.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/ktximage.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/ktximage.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/ktximage.h diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/maputils.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/maputils.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/maputils.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/maputils.h diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/memory.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/memory.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/memory.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/memory.h diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/multifiledownloader.cpp b/src/plugins/qmldesignerbase/libs/qmldesignerutils/multifiledownloader.cpp similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/multifiledownloader.cpp rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/multifiledownloader.cpp diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/multifiledownloader.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/multifiledownloader.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/multifiledownloader.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/multifiledownloader.h diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/qmldesignerutils_global.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/qmldesignerutils_global.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/qmldesignerutils_global.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/qmldesignerutils_global.h diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/stringutils.cpp b/src/plugins/qmldesignerbase/libs/qmldesignerutils/stringutils.cpp similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/stringutils.cpp rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/stringutils.cpp diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/stringutils.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/stringutils.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/stringutils.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/stringutils.h diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/version.cpp b/src/plugins/qmldesignerbase/libs/qmldesignerutils/version.cpp similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/version.cpp rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/version.cpp diff --git a/src/plugins/qmldesigner/libs/qmldesignerutils/version.h b/src/plugins/qmldesignerbase/libs/qmldesignerutils/version.h similarity index 100% rename from src/plugins/qmldesigner/libs/qmldesignerutils/version.h rename to src/plugins/qmldesignerbase/libs/qmldesignerutils/version.h