From c9e271c3f1f33f14ba822899155d91a80d6d09f5 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sat, 27 Aug 2022 22:30:55 +0300
Subject: [PATCH] fix qtTest
---
.gitignore | 2 +-
CMakeLists.txt | 2 +-
src/CQtDeployer/CMakeLists.txt | 2 +-
src/{LibDeploy => Deploy}/CMakeLists.txt | 0
src/{LibDeploy => Deploy}/CQtDeployer.qrc | 0
src/{LibDeploy => Deploy}/languages/en.ts | 0
.../src/DeployResources.qrc | 0
.../src/Distributions/Templates/Icon.ico | Bin
.../src/Distributions/Templates/Icon.png | Bin
.../Templates/deb/DEBIAN/control | 0
.../Templates/deb/DEBIAN/postinst | 0
.../Distributions/Templates/deb/DEBIAN/prerm | 0
.../Templates/qif/Styles/quasar.css | 0
.../Templates/qif/Styles/quasarDark.css | 0
.../qif/config custom designe/config.xml | 0
.../config custom designe/controlScript.qs | 0
.../qif/config custom designe/style.css | 0
.../Templates/qif/config/config.xml | 0
.../Templates/qif/config/controlScript.qs | 0
.../packages/default/meta/installscript.qs | 0
.../qif/packages/default/meta/package.xml | 0
.../Init multiPackage configuration.json | 0
.../configures/Init single configuration.json | 0
.../src/Distributions/configures/Init.json | 0
.../src/Distributions/deb.cpp | 0
.../src/Distributions/deb.h | 0
.../src/Distributions/defaultdistro.cpp | 0
.../src/Distributions/defaultdistro.h | 0
.../src/Distributions/idistribution.cpp | 0
.../src/Distributions/idistribution.h | 0
.../src/Distributions/qif.cpp | 0
.../src/Distributions/qif.h | 0
.../src/Distributions/templateinfo.cpp | 0
.../src/Distributions/templateinfo.h | 0
.../src/Distributions/ziparhive.cpp | 0
.../src/Distributions/ziparhive.h | 0
.../src/ScriptsTemplates/linux.sh | 0
.../src/ScriptsTemplates/windows.bat | 0
.../src/configparser.cpp | 38 +-
src/{LibDeploy => Deploy}/src/configparser.h | 2 +-
src/{LibDeploy => Deploy}/src/defines.h | 0
.../src/dependenciesscanner.cpp | 0
.../src/dependenciesscanner.h | 0
.../src/dependencymap.cpp | 0
src/{LibDeploy => Deploy}/src/dependencymap.h | 0
src/{LibDeploy => Deploy}/src/deploy.cpp | 0
src/{LibDeploy => Deploy}/src/deploy.h | 0
.../src/deploy_global.h.in | 0
.../src/deployconfig.cpp | 0
src/{LibDeploy => Deploy}/src/deployconfig.h | 0
src/{LibDeploy => Deploy}/src/deploycore.cpp | 0
src/{LibDeploy => Deploy}/src/deploycore.h | 0
.../src/distromodule.cpp | 0
src/{LibDeploy => Deploy}/src/distromodule.h | 0
.../src/distrostruct.cpp | 0
src/{LibDeploy => Deploy}/src/distrostruct.h | 0
src/{LibDeploy => Deploy}/src/elf_type.cpp | 48 +-
src/{LibDeploy => Deploy}/src/elf_type.h | 11 +-
src/{LibDeploy => Deploy}/src/envirement.cpp | 0
src/{LibDeploy => Deploy}/src/envirement.h | 0
src/{LibDeploy => Deploy}/src/extra.cpp | 0
src/{LibDeploy => Deploy}/src/extra.h | 0
src/{LibDeploy => Deploy}/src/extracter.cpp | 15 +-
src/{LibDeploy => Deploy}/src/extracter.h | 0
src/{LibDeploy => Deploy}/src/filemanager.cpp | 0
src/{LibDeploy => Deploy}/src/filemanager.h | 0
.../src/generalfiles_type.cpp | 0
.../src/generalfiles_type.h | 0
src/{LibDeploy => Deploy}/src/igetlibinfo.cpp | 0
src/{LibDeploy => Deploy}/src/igetlibinfo.h | 0
src/{LibDeploy => Deploy}/src/ignorerule.cpp | 0
src/{LibDeploy => Deploy}/src/ignorerule.h | 0
src/{LibDeploy => Deploy}/src/libinfo.cpp | 12 +-
src/{LibDeploy => Deploy}/src/libinfo.h | 6 +-
.../src/metafilemanager.cpp | 0
.../src/metafilemanager.h | 0
.../src/packagecontrol.cpp | 0
.../src/packagecontrol.h | 0
src/{LibDeploy => Deploy}/src/packing.cpp | 0
src/{LibDeploy => Deploy}/src/packing.h | 0
src/{LibDeploy => Deploy}/src/pathutils.cpp | 0
src/{LibDeploy => Deploy}/src/pathutils.h | 0
src/{LibDeploy => Deploy}/src/pe_type.cpp | 0
src/{LibDeploy => Deploy}/src/pe_type.h | 0
.../src/pluginsparser.cpp | 0
src/{LibDeploy => Deploy}/src/pluginsparser.h | 0
src/{LibDeploy => Deploy}/src/qml.cpp | 12 +-
src/{LibDeploy => Deploy}/src/qml.h | 0
src/{LibDeploy => Deploy}/src/qtdir.cpp | 0
src/{LibDeploy => Deploy}/src/qtdir.h | 0
src/{LibDeploy => Deploy}/src/targetdata.cpp | 0
src/{LibDeploy => Deploy}/src/targetdata.h | 0
src/{LibDeploy => Deploy}/src/targetinfo.cpp | 0
src/{LibDeploy => Deploy}/src/targetinfo.h | 0
.../src/zipcompresser.cpp | 0
src/{LibDeploy => Deploy}/src/zipcompresser.h | 0
testcases/TestQMLWidgets/CMakeLists.txt | 3 +
testcases/TestQMLWidgets/HomeForm.ui.qml | 1 -
testcases/TestQMLWidgets/Page1Form.ui.qml | 1 -
testcases/TestQMLWidgets/Page2Form.ui.qml | 1 -
testcases/TestQtWidgets/CMakeLists.txt | 5 +
.../{basic => }/.prev_CMakeLists.txt | 0
.../virtualkeyboard/{basic => }/Basic.qml | 0
testcases/virtualkeyboard/CMakeLists.txt | 62 +-
.../{basic => }/basic-b2qt.qml | 0
.../virtualkeyboard/{basic => }/basic.pro | 0
.../virtualkeyboard/basic/CMakeLists.txt | 73 --
.../{basic => }/content/AutoScroller.qml | 0
.../content/FloatingButton_Active.svg | 0
.../content/FloatingButton_Available.svg | 0
.../content/FloatingButton_Unavailable.svg | 0
.../content/HandwritingModeButton.qml | 0
.../{basic => }/content/TextArea.qml | 0
.../{basic => }/content/TextField.qml | 0
.../virtualkeyboard/{basic => }/demo.qrc | 0
.../virtualkeyboard/{basic => }/main.cpp | 0
testcases/virtualkeyboard/virtualkeyboard.pro | 3 -
testcases/webui/CMakeLists.txt | 5 +-
tests/CMakeLists.txt | 4 +-
tests/modules/modulesqt6_3.cpp | 820 +++++++++++++++++-
tests/tstMain.cpp | 21 +-
tests/units/qttest.cpp | 8 -
tests/units/testbase.cpp | 4 +
123 files changed, 999 insertions(+), 162 deletions(-)
rename src/{LibDeploy => Deploy}/CMakeLists.txt (100%)
rename src/{LibDeploy => Deploy}/CQtDeployer.qrc (100%)
rename src/{LibDeploy => Deploy}/languages/en.ts (100%)
rename src/{LibDeploy => Deploy}/src/DeployResources.qrc (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/Icon.ico (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/Icon.png (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/deb/DEBIAN/control (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/deb/DEBIAN/postinst (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/deb/DEBIAN/prerm (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/qif/Styles/quasar.css (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/qif/Styles/quasarDark.css (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/qif/config custom designe/config.xml (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/qif/config custom designe/controlScript.qs (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/qif/config custom designe/style.css (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/qif/config/config.xml (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/qif/config/controlScript.qs (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/qif/packages/default/meta/installscript.qs (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/Templates/qif/packages/default/meta/package.xml (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/configures/Init multiPackage configuration.json (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/configures/Init single configuration.json (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/configures/Init.json (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/deb.cpp (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/deb.h (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/defaultdistro.cpp (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/defaultdistro.h (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/idistribution.cpp (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/idistribution.h (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/qif.cpp (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/qif.h (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/templateinfo.cpp (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/templateinfo.h (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/ziparhive.cpp (100%)
rename src/{LibDeploy => Deploy}/src/Distributions/ziparhive.h (100%)
rename src/{LibDeploy => Deploy}/src/ScriptsTemplates/linux.sh (100%)
rename src/{LibDeploy => Deploy}/src/ScriptsTemplates/windows.bat (100%)
rename src/{LibDeploy => Deploy}/src/configparser.cpp (97%)
rename src/{LibDeploy => Deploy}/src/configparser.h (98%)
rename src/{LibDeploy => Deploy}/src/defines.h (100%)
rename src/{LibDeploy => Deploy}/src/dependenciesscanner.cpp (100%)
rename src/{LibDeploy => Deploy}/src/dependenciesscanner.h (100%)
rename src/{LibDeploy => Deploy}/src/dependencymap.cpp (100%)
rename src/{LibDeploy => Deploy}/src/dependencymap.h (100%)
rename src/{LibDeploy => Deploy}/src/deploy.cpp (100%)
rename src/{LibDeploy => Deploy}/src/deploy.h (100%)
rename src/{LibDeploy => Deploy}/src/deploy_global.h.in (100%)
rename src/{LibDeploy => Deploy}/src/deployconfig.cpp (100%)
rename src/{LibDeploy => Deploy}/src/deployconfig.h (100%)
rename src/{LibDeploy => Deploy}/src/deploycore.cpp (100%)
rename src/{LibDeploy => Deploy}/src/deploycore.h (100%)
rename src/{LibDeploy => Deploy}/src/distromodule.cpp (100%)
rename src/{LibDeploy => Deploy}/src/distromodule.h (100%)
rename src/{LibDeploy => Deploy}/src/distrostruct.cpp (100%)
rename src/{LibDeploy => Deploy}/src/distrostruct.h (100%)
rename src/{LibDeploy => Deploy}/src/elf_type.cpp (78%)
rename src/{LibDeploy => Deploy}/src/elf_type.h (92%)
rename src/{LibDeploy => Deploy}/src/envirement.cpp (100%)
rename src/{LibDeploy => Deploy}/src/envirement.h (100%)
rename src/{LibDeploy => Deploy}/src/extra.cpp (100%)
rename src/{LibDeploy => Deploy}/src/extra.h (100%)
rename src/{LibDeploy => Deploy}/src/extracter.cpp (96%)
rename src/{LibDeploy => Deploy}/src/extracter.h (100%)
rename src/{LibDeploy => Deploy}/src/filemanager.cpp (100%)
rename src/{LibDeploy => Deploy}/src/filemanager.h (100%)
rename src/{LibDeploy => Deploy}/src/generalfiles_type.cpp (100%)
rename src/{LibDeploy => Deploy}/src/generalfiles_type.h (100%)
rename src/{LibDeploy => Deploy}/src/igetlibinfo.cpp (100%)
rename src/{LibDeploy => Deploy}/src/igetlibinfo.h (100%)
rename src/{LibDeploy => Deploy}/src/ignorerule.cpp (100%)
rename src/{LibDeploy => Deploy}/src/ignorerule.h (100%)
rename src/{LibDeploy => Deploy}/src/libinfo.cpp (95%)
rename src/{LibDeploy => Deploy}/src/libinfo.h (95%)
rename src/{LibDeploy => Deploy}/src/metafilemanager.cpp (100%)
rename src/{LibDeploy => Deploy}/src/metafilemanager.h (100%)
rename src/{LibDeploy => Deploy}/src/packagecontrol.cpp (100%)
rename src/{LibDeploy => Deploy}/src/packagecontrol.h (100%)
rename src/{LibDeploy => Deploy}/src/packing.cpp (100%)
rename src/{LibDeploy => Deploy}/src/packing.h (100%)
rename src/{LibDeploy => Deploy}/src/pathutils.cpp (100%)
rename src/{LibDeploy => Deploy}/src/pathutils.h (100%)
rename src/{LibDeploy => Deploy}/src/pe_type.cpp (100%)
rename src/{LibDeploy => Deploy}/src/pe_type.h (100%)
rename src/{LibDeploy => Deploy}/src/pluginsparser.cpp (100%)
rename src/{LibDeploy => Deploy}/src/pluginsparser.h (100%)
rename src/{LibDeploy => Deploy}/src/qml.cpp (96%)
rename src/{LibDeploy => Deploy}/src/qml.h (100%)
rename src/{LibDeploy => Deploy}/src/qtdir.cpp (100%)
rename src/{LibDeploy => Deploy}/src/qtdir.h (100%)
rename src/{LibDeploy => Deploy}/src/targetdata.cpp (100%)
rename src/{LibDeploy => Deploy}/src/targetdata.h (100%)
rename src/{LibDeploy => Deploy}/src/targetinfo.cpp (100%)
rename src/{LibDeploy => Deploy}/src/targetinfo.h (100%)
rename src/{LibDeploy => Deploy}/src/zipcompresser.cpp (100%)
rename src/{LibDeploy => Deploy}/src/zipcompresser.h (100%)
rename testcases/virtualkeyboard/{basic => }/.prev_CMakeLists.txt (100%)
rename testcases/virtualkeyboard/{basic => }/Basic.qml (100%)
rename testcases/virtualkeyboard/{basic => }/basic-b2qt.qml (100%)
rename testcases/virtualkeyboard/{basic => }/basic.pro (100%)
delete mode 100644 testcases/virtualkeyboard/basic/CMakeLists.txt
rename testcases/virtualkeyboard/{basic => }/content/AutoScroller.qml (100%)
rename testcases/virtualkeyboard/{basic => }/content/FloatingButton_Active.svg (100%)
rename testcases/virtualkeyboard/{basic => }/content/FloatingButton_Available.svg (100%)
rename testcases/virtualkeyboard/{basic => }/content/FloatingButton_Unavailable.svg (100%)
rename testcases/virtualkeyboard/{basic => }/content/HandwritingModeButton.qml (100%)
rename testcases/virtualkeyboard/{basic => }/content/TextArea.qml (100%)
rename testcases/virtualkeyboard/{basic => }/content/TextField.qml (100%)
rename testcases/virtualkeyboard/{basic => }/demo.qrc (100%)
rename testcases/virtualkeyboard/{basic => }/main.cpp (100%)
delete mode 100644 testcases/virtualkeyboard/virtualkeyboard.pro
diff --git a/.gitignore b/.gitignore
index 8bbf0f6..7d37be6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,7 +87,7 @@ CTestTestfile.cmake
_deps
# cmake configured files
-src/LibDeploy/src/deploy_global.h
+src/Deploy/src/deploy_global.h
src/QtELFReader/src/elfreader_global.h
src/CQtDeployer/Deploy/CQtDeployer.json
src/CQtDeployer/Deploy/QIFWTemplate/packages/CQtDeployer/meta/package.xml
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36a1059..bf2b177 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ option(BUILD_COMMAND_LINE_TOOLS "Build Command Line Tools" OFF)
add_subdirectory(submodules/pe-parse)
add_subdirectory(submodules/zip)
-add_subdirectory(src/LibDeploy)
+add_subdirectory(src/Deploy)
if (DEFINED CQT_DEPLOYER_TOOL)
add_subdirectory(src/CQtDeployer)
diff --git a/src/CQtDeployer/CMakeLists.txt b/src/CQtDeployer/CMakeLists.txt
index 83dff93..3ebecd5 100644
--- a/src/CQtDeployer/CMakeLists.txt
+++ b/src/CQtDeployer/CMakeLists.txt
@@ -42,7 +42,7 @@ else()
endif()
-target_link_libraries(${CURRENT_PROJECT} PUBLIC LibDeploy)
+target_link_libraries(${CURRENT_PROJECT} PUBLIC Deploy)
target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR})
diff --git a/src/LibDeploy/CMakeLists.txt b/src/Deploy/CMakeLists.txt
similarity index 100%
rename from src/LibDeploy/CMakeLists.txt
rename to src/Deploy/CMakeLists.txt
diff --git a/src/LibDeploy/CQtDeployer.qrc b/src/Deploy/CQtDeployer.qrc
similarity index 100%
rename from src/LibDeploy/CQtDeployer.qrc
rename to src/Deploy/CQtDeployer.qrc
diff --git a/src/LibDeploy/languages/en.ts b/src/Deploy/languages/en.ts
similarity index 100%
rename from src/LibDeploy/languages/en.ts
rename to src/Deploy/languages/en.ts
diff --git a/src/LibDeploy/src/DeployResources.qrc b/src/Deploy/src/DeployResources.qrc
similarity index 100%
rename from src/LibDeploy/src/DeployResources.qrc
rename to src/Deploy/src/DeployResources.qrc
diff --git a/src/LibDeploy/src/Distributions/Templates/Icon.ico b/src/Deploy/src/Distributions/Templates/Icon.ico
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/Icon.ico
rename to src/Deploy/src/Distributions/Templates/Icon.ico
diff --git a/src/LibDeploy/src/Distributions/Templates/Icon.png b/src/Deploy/src/Distributions/Templates/Icon.png
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/Icon.png
rename to src/Deploy/src/Distributions/Templates/Icon.png
diff --git a/src/LibDeploy/src/Distributions/Templates/deb/DEBIAN/control b/src/Deploy/src/Distributions/Templates/deb/DEBIAN/control
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/deb/DEBIAN/control
rename to src/Deploy/src/Distributions/Templates/deb/DEBIAN/control
diff --git a/src/LibDeploy/src/Distributions/Templates/deb/DEBIAN/postinst b/src/Deploy/src/Distributions/Templates/deb/DEBIAN/postinst
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/deb/DEBIAN/postinst
rename to src/Deploy/src/Distributions/Templates/deb/DEBIAN/postinst
diff --git a/src/LibDeploy/src/Distributions/Templates/deb/DEBIAN/prerm b/src/Deploy/src/Distributions/Templates/deb/DEBIAN/prerm
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/deb/DEBIAN/prerm
rename to src/Deploy/src/Distributions/Templates/deb/DEBIAN/prerm
diff --git a/src/LibDeploy/src/Distributions/Templates/qif/Styles/quasar.css b/src/Deploy/src/Distributions/Templates/qif/Styles/quasar.css
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/qif/Styles/quasar.css
rename to src/Deploy/src/Distributions/Templates/qif/Styles/quasar.css
diff --git a/src/LibDeploy/src/Distributions/Templates/qif/Styles/quasarDark.css b/src/Deploy/src/Distributions/Templates/qif/Styles/quasarDark.css
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/qif/Styles/quasarDark.css
rename to src/Deploy/src/Distributions/Templates/qif/Styles/quasarDark.css
diff --git a/src/LibDeploy/src/Distributions/Templates/qif/config custom designe/config.xml b/src/Deploy/src/Distributions/Templates/qif/config custom designe/config.xml
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/qif/config custom designe/config.xml
rename to src/Deploy/src/Distributions/Templates/qif/config custom designe/config.xml
diff --git a/src/LibDeploy/src/Distributions/Templates/qif/config custom designe/controlScript.qs b/src/Deploy/src/Distributions/Templates/qif/config custom designe/controlScript.qs
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/qif/config custom designe/controlScript.qs
rename to src/Deploy/src/Distributions/Templates/qif/config custom designe/controlScript.qs
diff --git a/src/LibDeploy/src/Distributions/Templates/qif/config custom designe/style.css b/src/Deploy/src/Distributions/Templates/qif/config custom designe/style.css
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/qif/config custom designe/style.css
rename to src/Deploy/src/Distributions/Templates/qif/config custom designe/style.css
diff --git a/src/LibDeploy/src/Distributions/Templates/qif/config/config.xml b/src/Deploy/src/Distributions/Templates/qif/config/config.xml
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/qif/config/config.xml
rename to src/Deploy/src/Distributions/Templates/qif/config/config.xml
diff --git a/src/LibDeploy/src/Distributions/Templates/qif/config/controlScript.qs b/src/Deploy/src/Distributions/Templates/qif/config/controlScript.qs
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/qif/config/controlScript.qs
rename to src/Deploy/src/Distributions/Templates/qif/config/controlScript.qs
diff --git a/src/LibDeploy/src/Distributions/Templates/qif/packages/default/meta/installscript.qs b/src/Deploy/src/Distributions/Templates/qif/packages/default/meta/installscript.qs
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/qif/packages/default/meta/installscript.qs
rename to src/Deploy/src/Distributions/Templates/qif/packages/default/meta/installscript.qs
diff --git a/src/LibDeploy/src/Distributions/Templates/qif/packages/default/meta/package.xml b/src/Deploy/src/Distributions/Templates/qif/packages/default/meta/package.xml
similarity index 100%
rename from src/LibDeploy/src/Distributions/Templates/qif/packages/default/meta/package.xml
rename to src/Deploy/src/Distributions/Templates/qif/packages/default/meta/package.xml
diff --git a/src/LibDeploy/src/Distributions/configures/Init multiPackage configuration.json b/src/Deploy/src/Distributions/configures/Init multiPackage configuration.json
similarity index 100%
rename from src/LibDeploy/src/Distributions/configures/Init multiPackage configuration.json
rename to src/Deploy/src/Distributions/configures/Init multiPackage configuration.json
diff --git a/src/LibDeploy/src/Distributions/configures/Init single configuration.json b/src/Deploy/src/Distributions/configures/Init single configuration.json
similarity index 100%
rename from src/LibDeploy/src/Distributions/configures/Init single configuration.json
rename to src/Deploy/src/Distributions/configures/Init single configuration.json
diff --git a/src/LibDeploy/src/Distributions/configures/Init.json b/src/Deploy/src/Distributions/configures/Init.json
similarity index 100%
rename from src/LibDeploy/src/Distributions/configures/Init.json
rename to src/Deploy/src/Distributions/configures/Init.json
diff --git a/src/LibDeploy/src/Distributions/deb.cpp b/src/Deploy/src/Distributions/deb.cpp
similarity index 100%
rename from src/LibDeploy/src/Distributions/deb.cpp
rename to src/Deploy/src/Distributions/deb.cpp
diff --git a/src/LibDeploy/src/Distributions/deb.h b/src/Deploy/src/Distributions/deb.h
similarity index 100%
rename from src/LibDeploy/src/Distributions/deb.h
rename to src/Deploy/src/Distributions/deb.h
diff --git a/src/LibDeploy/src/Distributions/defaultdistro.cpp b/src/Deploy/src/Distributions/defaultdistro.cpp
similarity index 100%
rename from src/LibDeploy/src/Distributions/defaultdistro.cpp
rename to src/Deploy/src/Distributions/defaultdistro.cpp
diff --git a/src/LibDeploy/src/Distributions/defaultdistro.h b/src/Deploy/src/Distributions/defaultdistro.h
similarity index 100%
rename from src/LibDeploy/src/Distributions/defaultdistro.h
rename to src/Deploy/src/Distributions/defaultdistro.h
diff --git a/src/LibDeploy/src/Distributions/idistribution.cpp b/src/Deploy/src/Distributions/idistribution.cpp
similarity index 100%
rename from src/LibDeploy/src/Distributions/idistribution.cpp
rename to src/Deploy/src/Distributions/idistribution.cpp
diff --git a/src/LibDeploy/src/Distributions/idistribution.h b/src/Deploy/src/Distributions/idistribution.h
similarity index 100%
rename from src/LibDeploy/src/Distributions/idistribution.h
rename to src/Deploy/src/Distributions/idistribution.h
diff --git a/src/LibDeploy/src/Distributions/qif.cpp b/src/Deploy/src/Distributions/qif.cpp
similarity index 100%
rename from src/LibDeploy/src/Distributions/qif.cpp
rename to src/Deploy/src/Distributions/qif.cpp
diff --git a/src/LibDeploy/src/Distributions/qif.h b/src/Deploy/src/Distributions/qif.h
similarity index 100%
rename from src/LibDeploy/src/Distributions/qif.h
rename to src/Deploy/src/Distributions/qif.h
diff --git a/src/LibDeploy/src/Distributions/templateinfo.cpp b/src/Deploy/src/Distributions/templateinfo.cpp
similarity index 100%
rename from src/LibDeploy/src/Distributions/templateinfo.cpp
rename to src/Deploy/src/Distributions/templateinfo.cpp
diff --git a/src/LibDeploy/src/Distributions/templateinfo.h b/src/Deploy/src/Distributions/templateinfo.h
similarity index 100%
rename from src/LibDeploy/src/Distributions/templateinfo.h
rename to src/Deploy/src/Distributions/templateinfo.h
diff --git a/src/LibDeploy/src/Distributions/ziparhive.cpp b/src/Deploy/src/Distributions/ziparhive.cpp
similarity index 100%
rename from src/LibDeploy/src/Distributions/ziparhive.cpp
rename to src/Deploy/src/Distributions/ziparhive.cpp
diff --git a/src/LibDeploy/src/Distributions/ziparhive.h b/src/Deploy/src/Distributions/ziparhive.h
similarity index 100%
rename from src/LibDeploy/src/Distributions/ziparhive.h
rename to src/Deploy/src/Distributions/ziparhive.h
diff --git a/src/LibDeploy/src/ScriptsTemplates/linux.sh b/src/Deploy/src/ScriptsTemplates/linux.sh
similarity index 100%
rename from src/LibDeploy/src/ScriptsTemplates/linux.sh
rename to src/Deploy/src/ScriptsTemplates/linux.sh
diff --git a/src/LibDeploy/src/ScriptsTemplates/windows.bat b/src/Deploy/src/ScriptsTemplates/windows.bat
similarity index 100%
rename from src/LibDeploy/src/ScriptsTemplates/windows.bat
rename to src/Deploy/src/ScriptsTemplates/windows.bat
diff --git a/src/LibDeploy/src/configparser.cpp b/src/Deploy/src/configparser.cpp
similarity index 97%
rename from src/LibDeploy/src/configparser.cpp
rename to src/Deploy/src/configparser.cpp
index f5a6427..360af60 100644
--- a/src/LibDeploy/src/configparser.cpp
+++ b/src/Deploy/src/configparser.cpp
@@ -840,12 +840,12 @@ bool ConfigParser::parseClearMode() {
return true;
}
-QSet<QString> ConfigParser::getQtPathesFromTargets() {
- QSet<QString> res;
+QString ConfigParser::getRPathFromTargets() {
+ QString res;
for (const auto &i: _config.targets()) {
- if (i.isValid() && !i.getQtPath().isEmpty()) {
- res.insert(i.getQtPath());
+ if (i.isValid()) {
+ res += i.getRPath() + DeployCore::getEnvSeparator();
}
}
@@ -1175,9 +1175,9 @@ bool ConfigParser::initQmake() {
if (!info.isFile() || (info.baseName() != "qmake")) {
- auto qtList = getQtPathesFromTargets();
+ QString qmakeFromRPath = DeployCore::findProcess(getRPathFromTargets(), "qmake");
- if (qtList.isEmpty()) {
+ if (qmakeFromRPath.isEmpty()) {
if (!QuasarAppUtils::Params::isEndable("noCheckPATH")) {
auto env = QProcessEnvironment::systemEnvironment();
@@ -1190,6 +1190,14 @@ bool ConfigParser::initQmake() {
return false;
}
+
+ QuasarAppUtils::Params::log(QString("The qmake was found in the PATH variable. qmake : %0"
+ " If you want to disable search qmake executable in PATH variable,"
+ " use the noCheckPATH option").
+ arg(proc),
+ QuasarAppUtils::Info);
+
+
return initQmakePrivate(proc);
}
@@ -1203,21 +1211,15 @@ bool ConfigParser::initQmake() {
}
- if (qtList.size() > 1) {
- QuasarAppUtils::Params::log("Your deployment targets were compiled by different qmakes, "
- "auto-capture of the Qt libraries is not possible. "
- "Please use the -qmake flag to solve this problem.",
- QuasarAppUtils::Error);
- return false;
- }
- auto qt = *qtList.begin();
+ QuasarAppUtils::Params::log(QString("The qmake was found in the RPATH variable. qmake : %0"
+ " If you want to disable search qmake executable in RPATH variable,"
+ " use the noCheckRPATH option").
+ arg(qmakeFromRPath),
+ QuasarAppUtils::Info);
- if (qt.right(3).compare(QString("lib"), Qt::CaseInsensitive)) {
- return initQmakePrivate(QFileInfo(qt + "/../bin/qmake").absoluteFilePath());
- }
+ return initQmakePrivate(qmakeFromRPath);
- return initQmakePrivate(QFileInfo(qt + "/qmake").absoluteFilePath());
}
return initQmakePrivate(qmake);
diff --git a/src/LibDeploy/src/configparser.h b/src/Deploy/src/configparser.h
similarity index 98%
rename from src/LibDeploy/src/configparser.h
rename to src/Deploy/src/configparser.h
index 5fc6ace..51b51a0 100644
--- a/src/LibDeploy/src/configparser.h
+++ b/src/Deploy/src/configparser.h
@@ -62,7 +62,7 @@ private:
bool parseClearMode();
- QSet<QString> getQtPathesFromTargets();
+ QString getRPathFromTargets();
void setTargetDir(const QString &target = "");
bool setTargets(const QStringList &value);
diff --git a/src/LibDeploy/src/defines.h b/src/Deploy/src/defines.h
similarity index 100%
rename from src/LibDeploy/src/defines.h
rename to src/Deploy/src/defines.h
diff --git a/src/LibDeploy/src/dependenciesscanner.cpp b/src/Deploy/src/dependenciesscanner.cpp
similarity index 100%
rename from src/LibDeploy/src/dependenciesscanner.cpp
rename to src/Deploy/src/dependenciesscanner.cpp
diff --git a/src/LibDeploy/src/dependenciesscanner.h b/src/Deploy/src/dependenciesscanner.h
similarity index 100%
rename from src/LibDeploy/src/dependenciesscanner.h
rename to src/Deploy/src/dependenciesscanner.h
diff --git a/src/LibDeploy/src/dependencymap.cpp b/src/Deploy/src/dependencymap.cpp
similarity index 100%
rename from src/LibDeploy/src/dependencymap.cpp
rename to src/Deploy/src/dependencymap.cpp
diff --git a/src/LibDeploy/src/dependencymap.h b/src/Deploy/src/dependencymap.h
similarity index 100%
rename from src/LibDeploy/src/dependencymap.h
rename to src/Deploy/src/dependencymap.h
diff --git a/src/LibDeploy/src/deploy.cpp b/src/Deploy/src/deploy.cpp
similarity index 100%
rename from src/LibDeploy/src/deploy.cpp
rename to src/Deploy/src/deploy.cpp
diff --git a/src/LibDeploy/src/deploy.h b/src/Deploy/src/deploy.h
similarity index 100%
rename from src/LibDeploy/src/deploy.h
rename to src/Deploy/src/deploy.h
diff --git a/src/LibDeploy/src/deploy_global.h.in b/src/Deploy/src/deploy_global.h.in
similarity index 100%
rename from src/LibDeploy/src/deploy_global.h.in
rename to src/Deploy/src/deploy_global.h.in
diff --git a/src/LibDeploy/src/deployconfig.cpp b/src/Deploy/src/deployconfig.cpp
similarity index 100%
rename from src/LibDeploy/src/deployconfig.cpp
rename to src/Deploy/src/deployconfig.cpp
diff --git a/src/LibDeploy/src/deployconfig.h b/src/Deploy/src/deployconfig.h
similarity index 100%
rename from src/LibDeploy/src/deployconfig.h
rename to src/Deploy/src/deployconfig.h
diff --git a/src/LibDeploy/src/deploycore.cpp b/src/Deploy/src/deploycore.cpp
similarity index 100%
rename from src/LibDeploy/src/deploycore.cpp
rename to src/Deploy/src/deploycore.cpp
diff --git a/src/LibDeploy/src/deploycore.h b/src/Deploy/src/deploycore.h
similarity index 100%
rename from src/LibDeploy/src/deploycore.h
rename to src/Deploy/src/deploycore.h
diff --git a/src/LibDeploy/src/distromodule.cpp b/src/Deploy/src/distromodule.cpp
similarity index 100%
rename from src/LibDeploy/src/distromodule.cpp
rename to src/Deploy/src/distromodule.cpp
diff --git a/src/LibDeploy/src/distromodule.h b/src/Deploy/src/distromodule.h
similarity index 100%
rename from src/LibDeploy/src/distromodule.h
rename to src/Deploy/src/distromodule.h
diff --git a/src/LibDeploy/src/distrostruct.cpp b/src/Deploy/src/distrostruct.cpp
similarity index 100%
rename from src/LibDeploy/src/distrostruct.cpp
rename to src/Deploy/src/distrostruct.cpp
diff --git a/src/LibDeploy/src/distrostruct.h b/src/Deploy/src/distrostruct.h
similarity index 100%
rename from src/LibDeploy/src/distrostruct.h
rename to src/Deploy/src/distrostruct.h
diff --git a/src/LibDeploy/src/elf_type.cpp b/src/Deploy/src/elf_type.cpp
similarity index 78%
rename from src/LibDeploy/src/elf_type.cpp
rename to src/Deploy/src/elf_type.cpp
index cb2829a..50dfe61 100644
--- a/src/LibDeploy/src/elf_type.cpp
+++ b/src/Deploy/src/elf_type.cpp
@@ -50,6 +50,37 @@ int ELF::getVersionOfTag(const QByteArray& tag, QByteArray& source) const {
return ver;
}
+QString ELF::extractRPath(ElfReader& reader) const {
+
+ QString result;
+ if (!QuasarAppUtils::Params::isEndable("noCheckRPATH")) {
+ auto dynStr = getDynamicString(reader);
+
+ for (auto i = dynStr.rbegin(); i != dynStr.rend(); ++i) {
+
+ if (i->contains("end_")) {
+ return result;
+ }
+
+ const auto pathes = i->split(DeployCore::getEnvSeparator());
+ for (const auto &path: pathes) {
+ if (path.contains("/")) {
+ if (result.size()) {
+ result += DeployCore::getEnvSeparator() + DeployCore::transportPathToSnapRoot(path);
+ } else {
+ result += DeployCore::transportPathToSnapRoot(path);
+ }
+ }
+ }
+
+ if (result.size())
+ return result;
+ }
+ }
+
+ return result;
+}
+
bool ELF::getLibInfo(const QString &lib, LibInfo &info) const {
ElfReader reader(lib);
@@ -82,25 +113,10 @@ bool ELF::getLibInfo(const QString &lib, LibInfo &info) const {
return false;
}
- if (!QuasarAppUtils::Params::isEndable("noCheckRPATH")) {
- auto dynStr = getDynamicString(reader);
-
- for (auto i = dynStr.rbegin(); i != dynStr.rend(); ++i) {
-
- if (i->contains("end_")) {
- break;
- }
-
- if (QFileInfo(*i).isDir()) {
- info.setQtPath(DeployCore::transportPathToSnapRoot(*i));
- }
-
- }
- }
-
QFileInfo infolib(lib);
info.setName(infolib.fileName());
info.setPath(infolib.absolutePath());
+ info.setRPath(extractRPath(reader));
auto dep = reader.dependencies();
for (const auto &i : dep) {
diff --git a/src/LibDeploy/src/elf_type.h b/src/Deploy/src/elf_type.h
similarity index 92%
rename from src/LibDeploy/src/elf_type.h
rename to src/Deploy/src/elf_type.h
index f15b480..f2138fd 100644
--- a/src/LibDeploy/src/elf_type.h
+++ b/src/Deploy/src/elf_type.h
@@ -14,15 +14,18 @@
class ELF : public IGetLibInfo
{
+public:
+ ELF();
+
+ bool getLibInfo(const QString &lib, LibInfo &info) const override;
+
+
private:
QByteArrayList getDynamicString(ElfReader &reader) const;
int getVersionOfTag(const QByteArray &tag, QByteArray &source) const;
-public:
- ELF();
-
- bool getLibInfo(const QString &lib, LibInfo &info) const override;
+ QString extractRPath(ElfReader &reader) const;
};
#endif // ELF_H
diff --git a/src/LibDeploy/src/envirement.cpp b/src/Deploy/src/envirement.cpp
similarity index 100%
rename from src/LibDeploy/src/envirement.cpp
rename to src/Deploy/src/envirement.cpp
diff --git a/src/LibDeploy/src/envirement.h b/src/Deploy/src/envirement.h
similarity index 100%
rename from src/LibDeploy/src/envirement.h
rename to src/Deploy/src/envirement.h
diff --git a/src/LibDeploy/src/extra.cpp b/src/Deploy/src/extra.cpp
similarity index 100%
rename from src/LibDeploy/src/extra.cpp
rename to src/Deploy/src/extra.cpp
diff --git a/src/LibDeploy/src/extra.h b/src/Deploy/src/extra.h
similarity index 100%
rename from src/LibDeploy/src/extra.h
rename to src/Deploy/src/extra.h
diff --git a/src/LibDeploy/src/extracter.cpp b/src/Deploy/src/extracter.cpp
similarity index 96%
rename from src/LibDeploy/src/extracter.cpp
rename to src/Deploy/src/extracter.cpp
index 19166a1..cffa61f 100644
--- a/src/LibDeploy/src/extracter.cpp
+++ b/src/Deploy/src/extracter.cpp
@@ -473,10 +473,23 @@ bool Extracter::extractQml() {
}
}
+
+ QStringList toCopyQmlFiles;
+ for (const auto& plugin: qAsConst(plugins)) {
+ const auto qmlFiles = QDir(plugin).entryInfoList(QDir::Files);
+ for (const auto& qmlFile: qmlFiles) {
+ toCopyQmlFiles.push_back(qmlFile.absoluteFilePath());
+ }
+ }
+
+ // This function works very slow because use list mask
+ // solution: use the QSet and restriction comparese of the pathes for the mask argument.
+ // to-do optimise this function
if (!_fileManager->copyFolder(cnf->qtDir.getQmls(),
targetPath + distro.getQmlOutDir(),
DeployCore::debugExtensions() ,
- &listItems, &plugins)) {
+ &listItems,
+ &toCopyQmlFiles)) {
return false;
}
diff --git a/src/LibDeploy/src/extracter.h b/src/Deploy/src/extracter.h
similarity index 100%
rename from src/LibDeploy/src/extracter.h
rename to src/Deploy/src/extracter.h
diff --git a/src/LibDeploy/src/filemanager.cpp b/src/Deploy/src/filemanager.cpp
similarity index 100%
rename from src/LibDeploy/src/filemanager.cpp
rename to src/Deploy/src/filemanager.cpp
diff --git a/src/LibDeploy/src/filemanager.h b/src/Deploy/src/filemanager.h
similarity index 100%
rename from src/LibDeploy/src/filemanager.h
rename to src/Deploy/src/filemanager.h
diff --git a/src/LibDeploy/src/generalfiles_type.cpp b/src/Deploy/src/generalfiles_type.cpp
similarity index 100%
rename from src/LibDeploy/src/generalfiles_type.cpp
rename to src/Deploy/src/generalfiles_type.cpp
diff --git a/src/LibDeploy/src/generalfiles_type.h b/src/Deploy/src/generalfiles_type.h
similarity index 100%
rename from src/LibDeploy/src/generalfiles_type.h
rename to src/Deploy/src/generalfiles_type.h
diff --git a/src/LibDeploy/src/igetlibinfo.cpp b/src/Deploy/src/igetlibinfo.cpp
similarity index 100%
rename from src/LibDeploy/src/igetlibinfo.cpp
rename to src/Deploy/src/igetlibinfo.cpp
diff --git a/src/LibDeploy/src/igetlibinfo.h b/src/Deploy/src/igetlibinfo.h
similarity index 100%
rename from src/LibDeploy/src/igetlibinfo.h
rename to src/Deploy/src/igetlibinfo.h
diff --git a/src/LibDeploy/src/ignorerule.cpp b/src/Deploy/src/ignorerule.cpp
similarity index 100%
rename from src/LibDeploy/src/ignorerule.cpp
rename to src/Deploy/src/ignorerule.cpp
diff --git a/src/LibDeploy/src/ignorerule.h b/src/Deploy/src/ignorerule.h
similarity index 100%
rename from src/LibDeploy/src/ignorerule.h
rename to src/Deploy/src/ignorerule.h
diff --git a/src/LibDeploy/src/libinfo.cpp b/src/Deploy/src/libinfo.cpp
similarity index 95%
rename from src/LibDeploy/src/libinfo.cpp
rename to src/Deploy/src/libinfo.cpp
index 4f52289..6d494f0 100644
--- a/src/LibDeploy/src/libinfo.cpp
+++ b/src/Deploy/src/libinfo.cpp
@@ -84,14 +84,14 @@ void LibInfo::setPriority(const LibPriority &value) {
_priority = value;
}
-QString LibInfo::getQtPath() const
+const QString &LibInfo::getRPath() const
{
- return _qtPath;
+ return _rpath;
}
-void LibInfo::setQtPath(const QString &value)
+void LibInfo::setRPath(const QString &value)
{
- _qtPath = value;
+ _rpath = value;
}
WinAPI LibInfo::getWinApi() const {
@@ -124,7 +124,7 @@ QString LibInfo::toString() const {
return QString("LibInfo: path: '%0', name: '%1', qtPath: '%2', platform: '%3', dependencies: '%4'").
arg(_path,
_name,
- _qtPath,
+ _rpath,
DeployCore::platformToString(_platform),
dependenciesList.join(", "));
}
@@ -136,7 +136,7 @@ QString LibInfo::fullPath() const {
void LibInfo::clear() {
_path = "";
_name = "";
- _qtPath = "";
+ _rpath = "";
_platform = Platform::UnknownPlatform;
_dependncies.clear();
_allDep.clear();
diff --git a/src/LibDeploy/src/libinfo.h b/src/Deploy/src/libinfo.h
similarity index 95%
rename from src/LibDeploy/src/libinfo.h
rename to src/Deploy/src/libinfo.h
index edbf1d8..976f40f 100644
--- a/src/LibDeploy/src/libinfo.h
+++ b/src/Deploy/src/libinfo.h
@@ -42,8 +42,8 @@ public:
LibPriority getPriority() const;
void setPriority(const LibPriority &value);
- QString getQtPath() const;
- void setQtPath(const QString &value);
+ const QString& getRPath() const;
+ void setRPath(const QString &value);
WinAPI getWinApi() const;
void setWinApi(WinAPI winApi);
QtMajorVersion isDependetOfQt() const;
@@ -60,7 +60,7 @@ private:
QString _path;
QSet<QString> _dependncies;
bool _dependsOfGui;
- QString _qtPath;
+ QString _rpath;
LibPriority _priority = NotFile;
WinAPI _winApi = WinAPI::NoWinAPI;
diff --git a/src/LibDeploy/src/metafilemanager.cpp b/src/Deploy/src/metafilemanager.cpp
similarity index 100%
rename from src/LibDeploy/src/metafilemanager.cpp
rename to src/Deploy/src/metafilemanager.cpp
diff --git a/src/LibDeploy/src/metafilemanager.h b/src/Deploy/src/metafilemanager.h
similarity index 100%
rename from src/LibDeploy/src/metafilemanager.h
rename to src/Deploy/src/metafilemanager.h
diff --git a/src/LibDeploy/src/packagecontrol.cpp b/src/Deploy/src/packagecontrol.cpp
similarity index 100%
rename from src/LibDeploy/src/packagecontrol.cpp
rename to src/Deploy/src/packagecontrol.cpp
diff --git a/src/LibDeploy/src/packagecontrol.h b/src/Deploy/src/packagecontrol.h
similarity index 100%
rename from src/LibDeploy/src/packagecontrol.h
rename to src/Deploy/src/packagecontrol.h
diff --git a/src/LibDeploy/src/packing.cpp b/src/Deploy/src/packing.cpp
similarity index 100%
rename from src/LibDeploy/src/packing.cpp
rename to src/Deploy/src/packing.cpp
diff --git a/src/LibDeploy/src/packing.h b/src/Deploy/src/packing.h
similarity index 100%
rename from src/LibDeploy/src/packing.h
rename to src/Deploy/src/packing.h
diff --git a/src/LibDeploy/src/pathutils.cpp b/src/Deploy/src/pathutils.cpp
similarity index 100%
rename from src/LibDeploy/src/pathutils.cpp
rename to src/Deploy/src/pathutils.cpp
diff --git a/src/LibDeploy/src/pathutils.h b/src/Deploy/src/pathutils.h
similarity index 100%
rename from src/LibDeploy/src/pathutils.h
rename to src/Deploy/src/pathutils.h
diff --git a/src/LibDeploy/src/pe_type.cpp b/src/Deploy/src/pe_type.cpp
similarity index 100%
rename from src/LibDeploy/src/pe_type.cpp
rename to src/Deploy/src/pe_type.cpp
diff --git a/src/LibDeploy/src/pe_type.h b/src/Deploy/src/pe_type.h
similarity index 100%
rename from src/LibDeploy/src/pe_type.h
rename to src/Deploy/src/pe_type.h
diff --git a/src/LibDeploy/src/pluginsparser.cpp b/src/Deploy/src/pluginsparser.cpp
similarity index 100%
rename from src/LibDeploy/src/pluginsparser.cpp
rename to src/Deploy/src/pluginsparser.cpp
diff --git a/src/LibDeploy/src/pluginsparser.h b/src/Deploy/src/pluginsparser.h
similarity index 100%
rename from src/LibDeploy/src/pluginsparser.h
rename to src/Deploy/src/pluginsparser.h
diff --git a/src/LibDeploy/src/qml.cpp b/src/Deploy/src/qml.cpp
similarity index 96%
rename from src/LibDeploy/src/qml.cpp
rename to src/Deploy/src/qml.cpp
index 20535fd..f9beb90 100644
--- a/src/LibDeploy/src/qml.cpp
+++ b/src/Deploy/src/qml.cpp
@@ -46,6 +46,11 @@ QStringList QML::extractImportsFromFile(const QString &filepath) const {
matcher.setPattern("/\\*(.*)\\*/");
content.remove(matcher);
+
+ // Replace optional imports to restrict option, because before Qt 6.3 The Qml app needee of optional qml packas.
+ content.replace("optional import", "import");
+
+
const auto list = content.split("\n");
for (const QString &line : list)
for (QString &word : line.split(";", splitbehavior))
@@ -77,18 +82,19 @@ bool QML::extractImportsFromDir(const QString &path, bool recursive) {
for (const auto &import : qAsConst(imports)) {
if (!_imports.contains(import)) {
_imports.insert(import);
- extractImportsFromDir(getPathFromImport(import), recursive);
+ extractImportsFromDir(getPathFromImport(import), false);
}
}
}
for (const auto& module: qAsConst(qmlmodule)) {
QStringList imports = extractImportsFromQmlModule(module.absoluteFilePath());
+ imports += extractImportsFromFile(module.absoluteFilePath());
for (const auto &import : qAsConst(imports)) {
if (!_imports.contains(import)) {
_imports.insert(import);
- extractImportsFromDir(getPathFromImport(import), recursive);
+ extractImportsFromDir(getPathFromImport(import), false);
}
}
}
@@ -99,7 +105,7 @@ bool QML::extractImportsFromDir(const QString &path, bool recursive) {
auto importQtQml = "QtQml";
if (!_imports.contains(importQtQml)) {
_imports.insert(importQtQml);
- extractImportsFromDir(getPathFromImport(importQtQml), recursive);
+ extractImportsFromDir(getPathFromImport(importQtQml), false);
}
}
diff --git a/src/LibDeploy/src/qml.h b/src/Deploy/src/qml.h
similarity index 100%
rename from src/LibDeploy/src/qml.h
rename to src/Deploy/src/qml.h
diff --git a/src/LibDeploy/src/qtdir.cpp b/src/Deploy/src/qtdir.cpp
similarity index 100%
rename from src/LibDeploy/src/qtdir.cpp
rename to src/Deploy/src/qtdir.cpp
diff --git a/src/LibDeploy/src/qtdir.h b/src/Deploy/src/qtdir.h
similarity index 100%
rename from src/LibDeploy/src/qtdir.h
rename to src/Deploy/src/qtdir.h
diff --git a/src/LibDeploy/src/targetdata.cpp b/src/Deploy/src/targetdata.cpp
similarity index 100%
rename from src/LibDeploy/src/targetdata.cpp
rename to src/Deploy/src/targetdata.cpp
diff --git a/src/LibDeploy/src/targetdata.h b/src/Deploy/src/targetdata.h
similarity index 100%
rename from src/LibDeploy/src/targetdata.h
rename to src/Deploy/src/targetdata.h
diff --git a/src/LibDeploy/src/targetinfo.cpp b/src/Deploy/src/targetinfo.cpp
similarity index 100%
rename from src/LibDeploy/src/targetinfo.cpp
rename to src/Deploy/src/targetinfo.cpp
diff --git a/src/LibDeploy/src/targetinfo.h b/src/Deploy/src/targetinfo.h
similarity index 100%
rename from src/LibDeploy/src/targetinfo.h
rename to src/Deploy/src/targetinfo.h
diff --git a/src/LibDeploy/src/zipcompresser.cpp b/src/Deploy/src/zipcompresser.cpp
similarity index 100%
rename from src/LibDeploy/src/zipcompresser.cpp
rename to src/Deploy/src/zipcompresser.cpp
diff --git a/src/LibDeploy/src/zipcompresser.h b/src/Deploy/src/zipcompresser.h
similarity index 100%
rename from src/LibDeploy/src/zipcompresser.h
rename to src/Deploy/src/zipcompresser.h
diff --git a/testcases/TestQMLWidgets/CMakeLists.txt b/testcases/TestQMLWidgets/CMakeLists.txt
index 80c2ef6..68206d9 100644
--- a/testcases/TestQMLWidgets/CMakeLists.txt
+++ b/testcases/TestQMLWidgets/CMakeLists.txt
@@ -12,6 +12,9 @@ set(CMAKE_AUTOMOC ON)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Qml Quick)
set(CURRENT_PROJECT "TestQMLWidgets")
+# needed for test RPATH functions
+get_filename_component(QT_QT_ROOT "${Qt${QT_VERSION_MAJOR}Core_DIR}/../../.." ABSOLUTE)
+set(CMAKE_BUILD_RPATH ${QT_QT_ROOT}/bin)
file(GLOB_RECURSE SOURCE_CPP
"*.cpp" "*.h"
diff --git a/testcases/TestQMLWidgets/HomeForm.ui.qml b/testcases/TestQMLWidgets/HomeForm.ui.qml
index 6474fad..ecdde7c 100644
--- a/testcases/TestQMLWidgets/HomeForm.ui.qml
+++ b/testcases/TestQMLWidgets/HomeForm.ui.qml
@@ -1,4 +1,3 @@
-import QtQuick 2.10
import QtQuick.Controls 2.3
Page {
diff --git a/testcases/TestQMLWidgets/Page1Form.ui.qml b/testcases/TestQMLWidgets/Page1Form.ui.qml
index a25e78a..5c9adb8 100644
--- a/testcases/TestQMLWidgets/Page1Form.ui.qml
+++ b/testcases/TestQMLWidgets/Page1Form.ui.qml
@@ -1,4 +1,3 @@
-import QtQuick 2.10
import QtQuick.Controls 2.3
Page {
diff --git a/testcases/TestQMLWidgets/Page2Form.ui.qml b/testcases/TestQMLWidgets/Page2Form.ui.qml
index c34bb98..31cf90e 100644
--- a/testcases/TestQMLWidgets/Page2Form.ui.qml
+++ b/testcases/TestQMLWidgets/Page2Form.ui.qml
@@ -1,4 +1,3 @@
-import QtQuick 2.10
import QtQuick.Controls 2.3
Page {
diff --git a/testcases/TestQtWidgets/CMakeLists.txt b/testcases/TestQtWidgets/CMakeLists.txt
index 54ee87f..40f4289 100644
--- a/testcases/TestQtWidgets/CMakeLists.txt
+++ b/testcases/TestQtWidgets/CMakeLists.txt
@@ -9,6 +9,11 @@ cmake_minimum_required(VERSION 3.18)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widgets)
+# needed for test RPATH functions
+get_filename_component(QT_QT_ROOT "${Qt${QT_VERSION_MAJOR}Core_DIR}/../../.." ABSOLUTE)
+set(CMAKE_BUILD_RPATH ${QT_QT_ROOT}/bin)
+
+
set(CURRENT_PROJECT "QtWidgetsProject")
file(GLOB_RECURSE SOURCE_CPP
diff --git a/testcases/virtualkeyboard/basic/.prev_CMakeLists.txt b/testcases/virtualkeyboard/.prev_CMakeLists.txt
similarity index 100%
rename from testcases/virtualkeyboard/basic/.prev_CMakeLists.txt
rename to testcases/virtualkeyboard/.prev_CMakeLists.txt
diff --git a/testcases/virtualkeyboard/basic/Basic.qml b/testcases/virtualkeyboard/Basic.qml
similarity index 100%
rename from testcases/virtualkeyboard/basic/Basic.qml
rename to testcases/virtualkeyboard/Basic.qml
diff --git a/testcases/virtualkeyboard/CMakeLists.txt b/testcases/virtualkeyboard/CMakeLists.txt
index e04da6a..9782c00 100644
--- a/testcases/virtualkeyboard/CMakeLists.txt
+++ b/testcases/virtualkeyboard/CMakeLists.txt
@@ -1,3 +1,61 @@
-if(TARGET Qt::QuickControls2)
- qt_internal_add_example(basic)
+cmake_minimum_required(VERSION 3.16)
+project(basic LANGUAGES CXX)
+
+set(CMAKE_AUTOMOC ON)
+
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
+
+qt_add_executable(basic
+ main.cpp
+)
+
+set_target_properties(basic PROPERTIES
+ WIN32_EXECUTABLE TRUE
+ MACOSX_BUNDLE TRUE
+)
+
+target_link_libraries(basic PUBLIC
+ Qt::Core
+ Qt::Gui
+ Qt::Qml
+ Qt::Quick
+)
+
+# Resources:
+set(demo_resource_files
+ "Basic.qml"
+ "basic-b2qt.qml"
+ "content/AutoScroller.qml"
+ "content/FloatingButton_Active.svg"
+ "content/FloatingButton_Available.svg"
+ "content/FloatingButton_Unavailable.svg"
+ "content/HandwritingModeButton.qml"
+ "content/TextArea.qml"
+ "content/TextField.qml"
+)
+
+qt6_add_resources(basic "demo"
+ PREFIX
+ "/"
+ FILES
+ ${demo_resource_files}
+)
+
+if(QT_FEATURE_static)
+ find_package(Qt6 REQUIRED COMPONENTS Svg)
+ target_link_libraries(basic PUBLIC
+ Qt::Svg
+ )
+endif()
+
+if(NOT QT_FEATURE_vkb_desktop)
+ target_compile_definitions(basic PUBLIC
+ MAIN_QML="basic-b2qt.qml"
+ )
+endif()
+
+if(QT_FEATURE_vkb_desktop)
+ target_compile_definitions(basic PUBLIC
+ MAIN_QML="Basic.qml"
+ )
endif()
diff --git a/testcases/virtualkeyboard/basic/basic-b2qt.qml b/testcases/virtualkeyboard/basic-b2qt.qml
similarity index 100%
rename from testcases/virtualkeyboard/basic/basic-b2qt.qml
rename to testcases/virtualkeyboard/basic-b2qt.qml
diff --git a/testcases/virtualkeyboard/basic/basic.pro b/testcases/virtualkeyboard/basic.pro
similarity index 100%
rename from testcases/virtualkeyboard/basic/basic.pro
rename to testcases/virtualkeyboard/basic.pro
diff --git a/testcases/virtualkeyboard/basic/CMakeLists.txt b/testcases/virtualkeyboard/basic/CMakeLists.txt
deleted file mode 100644
index 8be9b50..0000000
--- a/testcases/virtualkeyboard/basic/CMakeLists.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-project(basic LANGUAGES CXX)
-
-set(CMAKE_AUTOMOC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/virtualkeyboard/basic")
-
-find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
-
-qt_add_executable(basic
- main.cpp
-)
-
-set_target_properties(basic PROPERTIES
- WIN32_EXECUTABLE TRUE
- MACOSX_BUNDLE TRUE
-)
-
-target_link_libraries(basic PUBLIC
- Qt::Core
- Qt::Gui
- Qt::Qml
- Qt::Quick
-)
-
-# Resources:
-set(demo_resource_files
- "Basic.qml"
- "basic-b2qt.qml"
- "content/AutoScroller.qml"
- "content/FloatingButton_Active.svg"
- "content/FloatingButton_Available.svg"
- "content/FloatingButton_Unavailable.svg"
- "content/HandwritingModeButton.qml"
- "content/TextArea.qml"
- "content/TextField.qml"
-)
-
-qt6_add_resources(basic "demo"
- PREFIX
- "/"
- FILES
- ${demo_resource_files}
-)
-
-if(QT_FEATURE_static)
- find_package(Qt6 REQUIRED COMPONENTS Svg)
- target_link_libraries(basic PUBLIC
- Qt::Svg
- )
-endif()
-
-if(NOT QT_FEATURE_vkb_desktop)
- target_compile_definitions(basic PUBLIC
- MAIN_QML="basic-b2qt.qml"
- )
-endif()
-
-if(QT_FEATURE_vkb_desktop)
- target_compile_definitions(basic PUBLIC
- MAIN_QML="Basic.qml"
- )
-endif()
-
-install(TARGETS basic
- RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
- BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
- LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/testcases/virtualkeyboard/basic/content/AutoScroller.qml b/testcases/virtualkeyboard/content/AutoScroller.qml
similarity index 100%
rename from testcases/virtualkeyboard/basic/content/AutoScroller.qml
rename to testcases/virtualkeyboard/content/AutoScroller.qml
diff --git a/testcases/virtualkeyboard/basic/content/FloatingButton_Active.svg b/testcases/virtualkeyboard/content/FloatingButton_Active.svg
similarity index 100%
rename from testcases/virtualkeyboard/basic/content/FloatingButton_Active.svg
rename to testcases/virtualkeyboard/content/FloatingButton_Active.svg
diff --git a/testcases/virtualkeyboard/basic/content/FloatingButton_Available.svg b/testcases/virtualkeyboard/content/FloatingButton_Available.svg
similarity index 100%
rename from testcases/virtualkeyboard/basic/content/FloatingButton_Available.svg
rename to testcases/virtualkeyboard/content/FloatingButton_Available.svg
diff --git a/testcases/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg b/testcases/virtualkeyboard/content/FloatingButton_Unavailable.svg
similarity index 100%
rename from testcases/virtualkeyboard/basic/content/FloatingButton_Unavailable.svg
rename to testcases/virtualkeyboard/content/FloatingButton_Unavailable.svg
diff --git a/testcases/virtualkeyboard/basic/content/HandwritingModeButton.qml b/testcases/virtualkeyboard/content/HandwritingModeButton.qml
similarity index 100%
rename from testcases/virtualkeyboard/basic/content/HandwritingModeButton.qml
rename to testcases/virtualkeyboard/content/HandwritingModeButton.qml
diff --git a/testcases/virtualkeyboard/basic/content/TextArea.qml b/testcases/virtualkeyboard/content/TextArea.qml
similarity index 100%
rename from testcases/virtualkeyboard/basic/content/TextArea.qml
rename to testcases/virtualkeyboard/content/TextArea.qml
diff --git a/testcases/virtualkeyboard/basic/content/TextField.qml b/testcases/virtualkeyboard/content/TextField.qml
similarity index 100%
rename from testcases/virtualkeyboard/basic/content/TextField.qml
rename to testcases/virtualkeyboard/content/TextField.qml
diff --git a/testcases/virtualkeyboard/basic/demo.qrc b/testcases/virtualkeyboard/demo.qrc
similarity index 100%
rename from testcases/virtualkeyboard/basic/demo.qrc
rename to testcases/virtualkeyboard/demo.qrc
diff --git a/testcases/virtualkeyboard/basic/main.cpp b/testcases/virtualkeyboard/main.cpp
similarity index 100%
rename from testcases/virtualkeyboard/basic/main.cpp
rename to testcases/virtualkeyboard/main.cpp
diff --git a/testcases/virtualkeyboard/virtualkeyboard.pro b/testcases/virtualkeyboard/virtualkeyboard.pro
deleted file mode 100644
index 8d129b2..0000000
--- a/testcases/virtualkeyboard/virtualkeyboard.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-
-qtHaveModule(quickcontrols2): SUBDIRS += basic
diff --git a/testcases/webui/CMakeLists.txt b/testcases/webui/CMakeLists.txt
index 30caa51..fc27a14 100644
--- a/testcases/webui/CMakeLists.txt
+++ b/testcases/webui/CMakeLists.txt
@@ -3,10 +3,13 @@ project(webui LANGUAGES CXX)
set(CMAKE_AUTOMOC ON)
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/webenginewidgets/webui")
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui WebEngineWidgets)
+# needed for test RPATH functions
+get_filename_component(QT_QT_ROOT "${Qt${QT_VERSION_MAJOR}Core_DIR}/../../.." ABSOLUTE)
+set(CMAKE_BUILD_RPATH ${QT_QT_ROOT}/bin)
+
# Resources:
file(GLOB_RECURSE SOURCE_QRC
"*.qrc"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 061bed5..ffe05dc 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -23,11 +23,11 @@ set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/modules"
get_filename_component(QT_QT_ROOT "${Qt${QT_VERSION_MAJOR}Core_DIR}/../../.." ABSOLUTE)
-add_definitions(-DQT_BASE_DIR="${QT_QT_ROOT}")
+add_definitions(-DQT_BASE_DIR="${QT_QT_ROOT}/")
add_definitions(-DTEST_BIN_DIR="${CMAKE_CURRENT_LIST_DIR}/../testcases/bin/")
add_executable(${CURRENT_PROJECT} ${SOURCE_CPP})
-target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test LibDeploy)
+target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test Deploy)
target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
diff --git a/tests/modules/modulesqt6_3.cpp b/tests/modules/modulesqt6_3.cpp
index 4ded56b..7c495ef 100644
--- a/tests/modules/modulesqt6_3.cpp
+++ b/tests/modules/modulesqt6_3.cpp
@@ -5,10 +5,815 @@ ModulesQt63::ModulesQt63() {
}
QSet<QString> ModulesQt63::qmlLibs(const QString &distDir) const {
+
TestUtils utils;
- auto res = ModulesQt5152::qmlLibs(distDir);
- return res;
+ auto Tree = qtLibs(distDir);
+
+ Tree = ignoreFilter(Tree, "/QtWidgetsProject");
+ Tree = ignoreFilter(Tree, "Qt6Widgets");
+
+#ifdef Q_OS_WIN
+ Tree += utils.createTree(
+ {
+ "./" + distDir + "/TestQMLWidgets.sh",
+ "./" + distDir + "/TestQMLWidgets.exe",
+ "./" + distDir + "Qt6Qml.so",
+ "./" + distDir + "Qt6QmlModels.so",
+ "./" + distDir + "Qt6QmlWorkerScript.so",
+ "./" + distDir + "Qt6Quick.so",
+ "./" + distDir + "Qt6QuickControls2.so",
+ "./" + distDir + "Qt6QuickControls2Impl.so",
+ "./" + distDir + "Qt6QuickShapes.so",
+ "./" + distDir + "Qt6QuickTemplates2.so",
+ "./" + distDir + "Qt6WaylandCompositor.so",
+ "./" + distDir + "Qt6WaylandEglCompositorHwIntegration.so",
+ "./" + distDir + "/plugins/tls/libqcertonlybackend.so",
+ "./" + distDir + "/plugins/tls/libqopensslbackend.so",
+ "./" + distDir + "/plugins/wayland-decoration-client/libbradient.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libdmabuf-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libdrm-egl-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libshm-emulation-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libvulkan-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so",
+ "./" + distDir + "/qml/QtQml/Models/libmodelsplugin.so",
+ "./" + distDir + "/qml/QtQml/Models/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQml/Models/qmldir",
+ "./" + distDir + "/qml/QtQml/WorkerScript/libworkerscriptplugin.so",
+ "./" + distDir + "/qml/QtQml/WorkerScript/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQml/WorkerScript/qmldir",
+ "./" + distDir + "/qml/QtQml/libqmlplugin.so",
+ "./" + distDir + "/qml/QtQml/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQml/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/AbstractButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Action.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ActionGroup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ApplicationWindow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/BusyIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Button.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ButtonGroup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Calendar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/CalendarModel.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/CheckBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/CheckDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ComboBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Container.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Control.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/DayOfWeekRow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/DelayButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Dial.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Dialog.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/DialogButtonBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Drawer.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Frame.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/GroupBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/HorizontalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ItemDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Label.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Menu.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/MenuBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/MenuBarItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/MenuItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/MenuSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/MonthGrid.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Page.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/PageIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Pane.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Popup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ProgressBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/RadioButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/RadioDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/RangeSlider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/RoundButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ScrollBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ScrollIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ScrollView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/SelectionRectangle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Slider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/SpinBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/SplitView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/StackView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/SwipeDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/SwipeView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Switch.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/SwitchDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/TabBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/TabButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/TextArea.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/TextField.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ToolBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ToolButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ToolSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ToolTip.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/TreeViewDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Tumbler.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/VerticalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/WeekNumberColumn.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/impl/libqtquickcontrols2basicstyleimplplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/impl/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/impl/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/libqtquickcontrols2basicstyleplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ApplicationWindow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/BusyIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Button.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/CheckBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/CheckDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ComboBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/DelayButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Dial.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Dialog.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/DialogButtonBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Drawer.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Frame.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/GroupBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/HorizontalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ItemDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Label.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Menu.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/MenuBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/MenuBarItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/MenuItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/MenuSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Page.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/PageIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Pane.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Popup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ProgressBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/RadioButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/RadioDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/RangeSlider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/RoundButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ScrollBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ScrollIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ScrollView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/SelectionRectangle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Slider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/SpinBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/SplitView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/SwipeDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Switch.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/SwitchDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/TabBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/TabButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/TextArea.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/TextField.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ToolBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ToolButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ToolSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ToolTip.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Tumbler.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/VerticalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/ButtonPanel.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/CheckIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/RadioIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/SliderGroove.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/SliderHandle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/SwitchIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/libqtquickcontrols2fusionstyleimplplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/libqtquickcontrols2fusionstyleplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ApplicationWindow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/BusyIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Button.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/CheckBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/CheckDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ComboBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/DelayButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Dial.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Dialog.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/DialogButtonBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Drawer.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Frame.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/GroupBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/HorizontalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ItemDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Label.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Menu.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/MenuItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/MenuSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Page.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/PageIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Pane.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Popup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ProgressBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/RadioButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/RadioDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/RangeSlider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/RoundButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ScrollBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ScrollIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ScrollView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/SelectionRectangle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Slider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/SpinBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/SplitView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/StackView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/SwipeDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/SwipeView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Switch.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/SwitchDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/TabBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/TabButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/TextArea.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/TextField.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ToolBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ToolButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ToolSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ToolTip.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Tumbler.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/VerticalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/impl/OpacityMask.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/impl/libqtquickcontrols2imaginestyleimplplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/impl/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/impl/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/libqtquickcontrols2imaginestyleplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ApplicationWindow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/BusyIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Button.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/CheckBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/CheckDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ComboBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/DelayButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Dial.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Dialog.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/DialogButtonBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Drawer.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Frame.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/GroupBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/HorizontalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ItemDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Label.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Menu.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/MenuBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/MenuBarItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/MenuItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/MenuSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Page.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/PageIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Pane.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Popup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ProgressBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/RadioButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/RadioDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/RangeSlider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/RoundButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ScrollBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ScrollIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ScrollView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/SelectionRectangle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Slider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/SpinBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/SplitView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/StackView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/SwipeDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/SwipeView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Switch.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/SwitchDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/TabBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/TabButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/TextArea.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/TextField.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ToolBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ToolButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ToolSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ToolTip.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Tumbler.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/VerticalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/BoxShadow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/CheckIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/CursorDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/ElevationEffect.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/RadioIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/RectangularGlow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/SliderHandle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/SwitchIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/libqtquickcontrols2materialstyleimplplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/libqtquickcontrols2materialstyleplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ApplicationWindow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/BusyIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Button.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/CheckBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/CheckDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ComboBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/DelayButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Dial.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Dialog.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/DialogButtonBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Drawer.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Frame.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/GroupBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/HorizontalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ItemDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Label.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Menu.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/MenuBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/MenuBarItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/MenuItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/MenuSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Page.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/PageIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Pane.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Popup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ProgressBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/RadioButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/RadioDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/RangeSlider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/RoundButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ScrollBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ScrollIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ScrollView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/SelectionRectangle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Slider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/SpinBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/SplitView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/StackView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/SwipeDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Switch.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/SwitchDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/TabBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/TabButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/TextArea.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/TextField.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ToolBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ToolButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ToolSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ToolTip.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Tumbler.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/VerticalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/impl/CheckIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/impl/RadioIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/impl/SwitchIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/impl/libqtquickcontrols2universalstyleimplplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/impl/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/impl/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/libqtquickcontrols2universalstyleplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/impl/libqtquickcontrols2implplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/impl/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/impl/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/libqtquickcontrols2plugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/qmldir",
+ "./" + distDir + "/qml/QtQuick/Shapes/libqmlshapesplugin.so",
+ "./" + distDir + "/qml/QtQuick/Shapes/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Shapes/qmldir",
+ "./" + distDir + "/qml/QtQuick/Templates/libqtquicktemplates2plugin.so",
+ "./" + distDir + "/qml/QtQuick/Templates/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Templates/qmldir",
+ "./" + distDir + "/qml/QtQuick/Window/libquickwindowplugin.so",
+ "./" + distDir + "/qml/QtQuick/Window/qmldir",
+ "./" + distDir + "/qml/QtQuick/Window/quickwindow.qmltypes",
+ "./" + distDir + "/qml/QtQuick/libqtquick2plugin.so",
+ "./" + distDir + "/qml/QtQuick/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/qmldir",
+ "./" + distDir + "/translations/qtdeclarative_ar.qm",
+ "./" + distDir + "/translations/qtdeclarative_bg.qm",
+ "./" + distDir + "/translations/qtdeclarative_ca.qm",
+ "./" + distDir + "/translations/qtdeclarative_da.qm",
+ "./" + distDir + "/translations/qtdeclarative_de.qm",
+ "./" + distDir + "/translations/qtdeclarative_en.qm",
+ "./" + distDir + "/translations/qtdeclarative_es.qm",
+ "./" + distDir + "/translations/qtdeclarative_fa.qm",
+ "./" + distDir + "/translations/qtdeclarative_fi.qm",
+ "./" + distDir + "/translations/qtdeclarative_fr.qm",
+ "./" + distDir + "/translations/qtdeclarative_hr.qm",
+ "./" + distDir + "/translations/qtdeclarative_hu.qm",
+ "./" + distDir + "/translations/qtdeclarative_ja.qm",
+ "./" + distDir + "/translations/qtdeclarative_ko.qm",
+ "./" + distDir + "/translations/qtdeclarative_lv.qm",
+ "./" + distDir + "/translations/qtdeclarative_nl.qm",
+ "./" + distDir + "/translations/qtdeclarative_nn.qm",
+ "./" + distDir + "/translations/qtdeclarative_pl.qm",
+ "./" + distDir + "/translations/qtdeclarative_pt_BR.qm",
+ "./" + distDir + "/translations/qtdeclarative_ru.qm",
+ "./" + distDir + "/translations/qtdeclarative_sk.qm",
+ "./" + distDir + "/translations/qtdeclarative_tr.qm",
+ "./" + distDir + "/translations/qtdeclarative_uk.qm",
+ "./" + distDir + "/translations/qtdeclarative_zh_CN.qm",
+ "./" + distDir + "/translations/qtdeclarative_zh_TW.qm"
+ }
+ );
+
+#else
+ Tree += utils.createTree(
+ {
+ "./" + distDir + "/TestQMLWidgets.sh",
+ "./" + distDir + "/bin/TestQMLWidgets",
+ "./" + distDir + "/lib/libQt6Qml.so",
+ "./" + distDir + "/lib/libQt6QmlModels.so",
+ "./" + distDir + "/lib/libQt6QmlWorkerScript.so",
+ "./" + distDir + "/lib/libQt6Quick.so",
+ "./" + distDir + "/lib/libQt6QuickControls2.so",
+ "./" + distDir + "/lib/libQt6QuickControls2Impl.so",
+ "./" + distDir + "/lib/libQt6QuickShapes.so",
+ "./" + distDir + "/lib/libQt6QuickTemplates2.so",
+ "./" + distDir + "/lib/libQt6WaylandCompositor.so",
+ "./" + distDir + "/lib/libQt6WaylandEglCompositorHwIntegration.so",
+ "./" + distDir + "/plugins/tls/libqcertonlybackend.so",
+ "./" + distDir + "/plugins/tls/libqopensslbackend.so",
+ "./" + distDir + "/plugins/wayland-decoration-client/libbradient.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libdmabuf-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libdrm-egl-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libshm-emulation-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-client/libvulkan-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so",
+ "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so",
+ "./" + distDir + "/qml/QtQml/Models/libmodelsplugin.so",
+ "./" + distDir + "/qml/QtQml/Models/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQml/Models/qmldir",
+ "./" + distDir + "/qml/QtQml/WorkerScript/libworkerscriptplugin.so",
+ "./" + distDir + "/qml/QtQml/WorkerScript/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQml/WorkerScript/qmldir",
+ "./" + distDir + "/qml/QtQml/libqmlplugin.so",
+ "./" + distDir + "/qml/QtQml/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQml/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/AbstractButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Action.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ActionGroup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ApplicationWindow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/BusyIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Button.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ButtonGroup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Calendar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/CalendarModel.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/CheckBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/CheckDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ComboBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Container.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Control.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/DayOfWeekRow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/DelayButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Dial.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Dialog.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/DialogButtonBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Drawer.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Frame.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/GroupBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/HorizontalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ItemDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Label.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Menu.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/MenuBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/MenuBarItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/MenuItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/MenuSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/MonthGrid.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Page.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/PageIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Pane.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Popup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ProgressBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/RadioButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/RadioDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/RangeSlider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/RoundButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ScrollBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ScrollIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ScrollView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/SelectionRectangle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Slider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/SpinBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/SplitView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/StackView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/SwipeDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/SwipeView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Switch.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/SwitchDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/TabBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/TabButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/TextArea.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/TextField.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ToolBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ToolButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ToolSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/ToolTip.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/TreeViewDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/Tumbler.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/VerticalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/WeekNumberColumn.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/impl/libqtquickcontrols2basicstyleimplplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/impl/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/impl/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/libqtquickcontrols2basicstyleplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Basic/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ApplicationWindow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/BusyIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Button.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/CheckBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/CheckDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ComboBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/DelayButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Dial.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Dialog.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/DialogButtonBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Drawer.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Frame.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/GroupBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/HorizontalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ItemDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Label.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Menu.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/MenuBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/MenuBarItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/MenuItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/MenuSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Page.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/PageIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Pane.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Popup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ProgressBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/RadioButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/RadioDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/RangeSlider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/RoundButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ScrollBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ScrollIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ScrollView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/SelectionRectangle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Slider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/SpinBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/SplitView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/SwipeDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Switch.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/SwitchDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/TabBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/TabButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/TextArea.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/TextField.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ToolBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ToolButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ToolSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/ToolTip.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/Tumbler.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/VerticalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/ButtonPanel.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/CheckIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/RadioIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/SliderGroove.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/SliderHandle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/SwitchIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/libqtquickcontrols2fusionstyleimplplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/impl/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/libqtquickcontrols2fusionstyleplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Fusion/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ApplicationWindow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/BusyIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Button.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/CheckBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/CheckDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ComboBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/DelayButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Dial.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Dialog.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/DialogButtonBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Drawer.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Frame.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/GroupBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/HorizontalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ItemDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Label.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Menu.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/MenuItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/MenuSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Page.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/PageIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Pane.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Popup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ProgressBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/RadioButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/RadioDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/RangeSlider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/RoundButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ScrollBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ScrollIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ScrollView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/SelectionRectangle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Slider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/SpinBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/SplitView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/StackView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/SwipeDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/SwipeView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Switch.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/SwitchDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/TabBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/TabButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/TextArea.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/TextField.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ToolBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ToolButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ToolSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/ToolTip.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/Tumbler.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/VerticalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/impl/OpacityMask.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/impl/libqtquickcontrols2imaginestyleimplplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/impl/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/impl/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/libqtquickcontrols2imaginestyleplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Imagine/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ApplicationWindow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/BusyIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Button.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/CheckBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/CheckDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ComboBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/DelayButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Dial.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Dialog.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/DialogButtonBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Drawer.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Frame.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/GroupBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/HorizontalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ItemDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Label.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Menu.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/MenuBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/MenuBarItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/MenuItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/MenuSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Page.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/PageIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Pane.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Popup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ProgressBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/RadioButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/RadioDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/RangeSlider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/RoundButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ScrollBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ScrollIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ScrollView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/SelectionRectangle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Slider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/SpinBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/SplitView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/StackView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/SwipeDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/SwipeView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Switch.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/SwitchDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/TabBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/TabButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/TextArea.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/TextField.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ToolBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ToolButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ToolSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/ToolTip.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/Tumbler.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/VerticalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/BoxShadow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/CheckIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/CursorDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/ElevationEffect.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/RadioIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/RectangularGlow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/SliderHandle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/SwitchIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/libqtquickcontrols2materialstyleimplplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/impl/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/libqtquickcontrols2materialstyleplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Material/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ApplicationWindow.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/BusyIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Button.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/CheckBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/CheckDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ComboBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/DelayButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Dial.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Dialog.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/DialogButtonBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Drawer.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Frame.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/GroupBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/HorizontalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ItemDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Label.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Menu.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/MenuBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/MenuBarItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/MenuItem.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/MenuSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Page.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/PageIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Pane.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Popup.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ProgressBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/RadioButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/RadioDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/RangeSlider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/RoundButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ScrollBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ScrollIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ScrollView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/SelectionRectangle.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Slider.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/SpinBox.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/SplitView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/StackView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/SwipeDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Switch.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/SwitchDelegate.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/TabBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/TabButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/TextArea.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/TextField.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ToolBar.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ToolButton.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ToolSeparator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/ToolTip.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/Tumbler.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/VerticalHeaderView.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/impl/CheckIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/impl/RadioIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/impl/SwitchIndicator.qml",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/impl/libqtquickcontrols2universalstyleimplplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/impl/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/impl/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/libqtquickcontrols2universalstyleplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/Universal/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/impl/libqtquickcontrols2implplugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/impl/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/impl/qmldir",
+ "./" + distDir + "/qml/QtQuick/Controls/libqtquickcontrols2plugin.so",
+ "./" + distDir + "/qml/QtQuick/Controls/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Controls/qmldir",
+ "./" + distDir + "/qml/QtQuick/Shapes/libqmlshapesplugin.so",
+ "./" + distDir + "/qml/QtQuick/Shapes/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Shapes/qmldir",
+ "./" + distDir + "/qml/QtQuick/Templates/libqtquicktemplates2plugin.so",
+ "./" + distDir + "/qml/QtQuick/Templates/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/Templates/qmldir",
+ "./" + distDir + "/qml/QtQuick/Window/libquickwindowplugin.so",
+ "./" + distDir + "/qml/QtQuick/Window/qmldir",
+ "./" + distDir + "/qml/QtQuick/Window/quickwindow.qmltypes",
+ "./" + distDir + "/qml/QtQuick/libqtquick2plugin.so",
+ "./" + distDir + "/qml/QtQuick/plugins.qmltypes",
+ "./" + distDir + "/qml/QtQuick/qmldir",
+ "./" + distDir + "/translations/qtdeclarative_ar.qm",
+ "./" + distDir + "/translations/qtdeclarative_bg.qm",
+ "./" + distDir + "/translations/qtdeclarative_ca.qm",
+ "./" + distDir + "/translations/qtdeclarative_da.qm",
+ "./" + distDir + "/translations/qtdeclarative_de.qm",
+ "./" + distDir + "/translations/qtdeclarative_en.qm",
+ "./" + distDir + "/translations/qtdeclarative_es.qm",
+ "./" + distDir + "/translations/qtdeclarative_fa.qm",
+ "./" + distDir + "/translations/qtdeclarative_fi.qm",
+ "./" + distDir + "/translations/qtdeclarative_fr.qm",
+ "./" + distDir + "/translations/qtdeclarative_hr.qm",
+ "./" + distDir + "/translations/qtdeclarative_hu.qm",
+ "./" + distDir + "/translations/qtdeclarative_ja.qm",
+ "./" + distDir + "/translations/qtdeclarative_ko.qm",
+ "./" + distDir + "/translations/qtdeclarative_lv.qm",
+ "./" + distDir + "/translations/qtdeclarative_nl.qm",
+ "./" + distDir + "/translations/qtdeclarative_nn.qm",
+ "./" + distDir + "/translations/qtdeclarative_pl.qm",
+ "./" + distDir + "/translations/qtdeclarative_pt_BR.qm",
+ "./" + distDir + "/translations/qtdeclarative_ru.qm",
+ "./" + distDir + "/translations/qtdeclarative_sk.qm",
+ "./" + distDir + "/translations/qtdeclarative_tr.qm",
+ "./" + distDir + "/translations/qtdeclarative_uk.qm",
+ "./" + distDir + "/translations/qtdeclarative_zh_CN.qm",
+ "./" + distDir + "/translations/qtdeclarative_zh_TW.qm"
+ }
+ );
+#endif
+ return Tree;
}
QSet<QString> ModulesQt63::testDistroLibs(const QString &distDir) const {
@@ -43,9 +848,9 @@ QSet<QString> ModulesQt63::qtLibs(const QString &distDir) const {
#ifdef Q_OS_WIN
Tree += utils.createTree(
{
- "./" + distDir + "/QtWidgetsProject.sh",
- "./" + distDir + "/bin/QtWidgetsProject",
- "./" + distDir + "/bin/qt.conf",
+ "./" + distDir + "/QtWidgetsProject.bat",
+ "./" + distDir + "/QtWidgetsProject.exe",
+ "./" + distDir + "/qt.conf",
"./" + distDir + "/Qt6Core.so",
"./" + distDir + "/Qt6DBus.so",
"./" + distDir + "/Qt6EglFSDeviceIntegration.so",
@@ -216,9 +1021,8 @@ QSet<QString> ModulesQt63::qmlVirtualKeyBoadrLibs(const QString &distDir) const
}
-QSet<QString> ModulesQt63::qtWithoutTr(const QString &distDir) const
-{
-
+QSet<QString> ModulesQt63::qtWithoutTr(const QString &distDir) const {
+ return ignoreFilter(qtLibs(distDir), "translations");
}
QSet<QString> ModulesQt63::qtWebEngine(const QString &distDir) const
diff --git a/tests/tstMain.cpp b/tests/tstMain.cpp
index 36ae7dc..fa8fd74 100644
--- a/tests/tstMain.cpp
+++ b/tests/tstMain.cpp
@@ -223,16 +223,22 @@ void tstMain::cleanupTestCase() {
* init all availabel units for testsing
*/
tstMain::tstMain() {
+ auto originalPath = qgetenv("CQT_TEST_ORIGINAL_PATH");
+ if (originalPath.isEmpty()) {
+ qputenv("CQT_TEST_ORIGINAL_PATH", qgetenv("PATH"));
+ }
+
qputenv("QTEST_FUNCTION_TIMEOUT", "1800000");
- QString qifwPath = qgetenv("PATH") + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.0/bin/";
- qifwPath += qifwPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.1/bin/";
- qifwPath += qifwPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.2/bin/";
- qifwPath += qifwPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.3/bin/";
- qifwPath += qifwPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.4/bin/";
- qifwPath += qifwPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.5/bin/";
+ QString cqtTestPath = qgetenv("CQT_TEST_ORIGINAL_PATH") + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.0/bin/";
+ cqtTestPath += cqtTestPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.1/bin/";
+ cqtTestPath += cqtTestPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.2/bin/";
+ cqtTestPath += cqtTestPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.3/bin/";
+ cqtTestPath += cqtTestPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.4/bin/";
+ cqtTestPath += cqtTestPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.5/bin/";
+ cqtTestPath += cqtTestPath + DeployCore::getEnvSeparator() + QT_BASE_DIR + "/bin/";
- qputenv("PATH", qifwPath.toLatin1().data());
+ qputenv("PATH", cqtTestPath.toLatin1().data());
TestUtils utils;
QStringList pathList = QProcessEnvironment::systemEnvironment().
@@ -268,6 +274,7 @@ tstMain::~tstMain() {
}
void tstMain::initTest(Test *test) {
+
QTimer::singleShot(0, this, [this, test]() {
test->test();
delete test;
diff --git a/tests/units/qttest.cpp b/tests/units/qttest.cpp
index f661d59..2616b29 100644
--- a/tests/units/qttest.cpp
+++ b/tests/units/qttest.cpp
@@ -64,12 +64,4 @@ void QtTest::test() {
"-qmake", qmake,
"-qmlDir", TestBinDir + "/../TestQMLWidgets"}, &comapareTree);
-
-#ifdef Q_OS_UNIX
-
- runTestParams({"-bin", bin, "clear" ,
- "-qmlDir", TestBinDir + "/../TestQMLWidgets"}, &comapareTree);
-
-#endif
-
}
diff --git a/tests/units/testbase.cpp b/tests/units/testbase.cpp
index 9104ee6..f3b0f6f 100644
--- a/tests/units/testbase.cpp
+++ b/tests/units/testbase.cpp
@@ -45,6 +45,10 @@ void TestBase::deleteLib(const QString &paath) {
}
}
+void TestBase::cleanupTestCase() {
+
+}
+
void TestBase::checkResults(const QSet<QString> &tree, bool noWarnings, bool onlySize) {
TestUtils utils;