Merge pull request #835 from QuasarApp/task_834

Build base on OS binaries

CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 QuasarApp.
+# Copyright (C) 2020-2024 QuasarApp.
 # Distributed under the GPLv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.
@@ -8,7 +8,7 @@
 cmake_minimum_required(VERSION 3.18)
 project(CQtDeployer LANGUAGES CXX)
 if(TARGET ${PROJECT_NAME})
-  message("The ${PROJECT_NAME} arledy included in main Project")
+  message("The ${PROJECT_NAME} already included in main Project")
   return()
 endif()
 
@@ -40,20 +40,20 @@ updateGitVars()
 string(TIMESTAMP TODAY "%Y-%m-%d")
 set(CQT_DEPLOYER_VERSION_SHORT_PREFIX "1.6")
 set(CQT_DEPLOYER_VERSION "${CQT_DEPLOYER_VERSION_SHORT_PREFIX}.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}")
-set(QIFW_VERSION "4.6") # rebuild for the 4.6.0
+set(QIFW_VERSION "4.7") # rebuild for the 4.7.0
 
 option(CQT_DEPLOYER_TESTS "This option disables or enables tests of the ${PROJECT_NAME} project" ${Qt${QT_VERSION_MAJOR}Test_FOUND})
 option(CQT_DEPLOYER_TOOL "This option disables or enables example app of the ${PROJECT_NAME} project" ON)
 
 if (ANDROID OR IOS OR NOT QT_VERSION_MAJOR OR QA_WASM32)
-    message(WARNING "CQtDeployer is not availabel for wasm, android and ios platforms")
+    message(WARNING "CQtDeployer is not available for wasm, android and ios platforms")
     initAll()
     return()
 endif()
 
 if (${QT_VERSION_MAJOR} LESS 6)
     message(WARNING "CQtDeployer tests is not available for qt5. Please build cqtdeployer with qt6")
-    set(CQT_DEPLOYER_TESTS OFF CACHE BOOL "This option force disbled for ANDROID IOS QA_WASM32 and Not Qt projects" FORCE)
+    set(CQT_DEPLOYER_TESTS OFF CACHE BOOL "This option force disabled for ANDROID IOS QA_WASM32 and Not Qt projects" FORCE)
 endif()
 
 make_directory(Distro)
@@ -76,6 +76,9 @@ else()
 endif()
 
 if (CQT_DEPLOYER_TESTS)
+    find_package(Qt${QT_VERSION_MAJOR} COMPONENTS WebEngineQuick)
+
+
     add_subdirectory(testcases)
     add_subdirectory(tests)
 else()

README.md

@@ -37,8 +37,14 @@ Key differences of this program:
 
 ## Supported platforms:
 
-* <img src="https://user-images.githubusercontent.com/12465465/67766480-929b5000-fa5f-11e9-8ae7-377d9ddb7c65.png"  height="100">
+* Linux 
-* <img src="https://upload.wikimedia.org/wikipedia/commons/8/8d/Windows_darkblue_2012.svg"  height="100">
+    - deb
+    - snap
+    - raw binaries
+    - installer
+* Windows 
+    - raw binaries
+    - installer
 
 ## Supported processors architectures:
 * x86

md/en/Build-and-Install.md

@@ -55,7 +55,7 @@ sudo snap connect cqtdeployer:system-backup
 
 # Build from sources
 
-## Build for Linux
+## Build for Linux (using official qt binaries)
 
 - install qt and qt QtInstallFrameWork from [qt installer](https://www.qt.io/download-qt-installer?hsCtaTracking=9f6a2170-a938-42df-a8e2-a9f0b1d6cdce%7C6cb0de4f9bb77-7bb77-4bb77-4)
 - clone project 
@@ -92,6 +92,47 @@ sudo snap connect cqtdeployer:system-backup
     ```
     
 
+## Build for Linux (using native OS binaries)
+
+- clone project 
+ 
+    ``` bash
+    git clone https://github.com/QuasarApp/CQtDeployer.git
+    git submodule update --init --recursive
+    cd CQtDeployer
+    ```
+    
+- create temp build directory
+
+    ``` bash
+    mkdir build 
+    cd build
+    ```
+    
+- Install qt from package manager (for example apt on ubuntu)
+
+    ``` bash
+    sudo apt install qt6-base-dev
+    ```
+    
+- run cmake 
+
+    ``` bash
+    cmake .. -DCQT_DEPLOYER_TESTS=0
+    ```
+    
+- build cqtdeployer 
+
+    ``` bash
+    cmake --build .. --parallel 
+    ```
+    
+- create cqtdeployer executable.
+
+    ``` bash
+    make install 
+    ```
+
 ## Build for Windows (CMD)
 
 - install qt and qt QtInstallFrameWork from [qt installer](https://www.qt.io/download-qt-installer?hsCtaTracking=9f6a2170-a938-42df-a8e2-a9f0b1d6cdce%7C6cb0de4f9bb77-7bb77-4bb77-4)

md/en/CustomScripts.md

@@ -66,4 +66,4 @@ CQT_RUN_COMMAND
 ```
 
 
-Or you can get last version of this scripts from the github [repository](https://github.com/QuasarApp/CQtDeployer/tree/main/Deploy/ScriptsTemplates).
+Or you can get last version of this scripts from the github [repository](https://github.com/QuasarApp/CQtDeployer/tree/main/src/Deploy/src/ScriptsTemplates).

md/en/Options.md

@@ -41,7 +41,7 @@ cqtdeployer -option1 value1 -option2 list, of, values ​​flag1 flag2 flag3
 
 ### Boolean options
 
-| Option                      | Descriptiion                                              |
+| Option                      | Description                                              |
 |-----------------------------|-----------------------------------------------------------|
 |   init                      | will initialize cqtdeployer.json file (configuration file)|
 |                             | For example: "cqtdeployer init" - for initialize base package configuration|
@@ -58,7 +58,7 @@ cqtdeployer -option1 value1 -option2 list, of, values ​​flag1 flag2 flag3
 |   noCheckPATH               | Disables automatic search of paths to qmake in system PATH.     |
 |   noRecursiveiIgnoreEnv     | Disables recursive ignore for ignoreEnv option.                 |
 |   v / version               | Shows compiled version                                          |
-|   qif                       | Create the QIF installer for deployment programm"              |
+|   qif                       | Create the QIF installer for deployment program"              |
 |                             | Example: cqtdeployer qif" },                              |
 |                             | Starting with CQtDeployer 1.5 you can specify the path to your own installer template. |
 |                             | Examples: cqtdeployer -qif path/to/myCustom/qif. More details can be found [here](QIF.md) |
@@ -66,8 +66,8 @@ cqtdeployer -option1 value1 -option2 list, of, values ​​flag1 flag2 flag3
 |                             | Example: cqtdeployer deb" },                              |
 |                             | you can specify the path to your own DEBIAN template. |
 |                             | Examples: cqtdeployer -deb path/to/myCustom/DEBIAN. More details can be found [here](DEB.md) |
-|   deploySystem              | Deploys all libraries not recomendet because there may be conflicts with system libraries  |
+|   deploySystem              | Deploys all libraries not recommended because there may be conflicts with system libraries  |
-|   noQt                      | Ignors the error of initialize of a qmake. Use only if your application does not use the qt framework. |
+|   noQt                      | Ignores the error of initialize of a qmake. Use only if your application does not use the qt framework. |
 |   allowEmptyPackages        | Allows configure the empty packages.                            |
 |   getDefaultTemplate        | Extracts defaults deb or qif templates. For more information see the  extracting default templates [page](ExtractDefaultsTemplates.md)       |
 |   noHashSum                 | Disable computation of a packages hash sum               |
@@ -75,7 +75,7 @@ cqtdeployer -option1 value1 -option2 list, of, values ​​flag1 flag2 flag3
 
 ### Deploy options
 
-| Option                      | Descriptiion                                              |
+| Option                      | Description                                              |
 |-----------------------------|-----------------------------------------------------------|
 |   -bin [list,params]        | Files to deploy or folders that contain files to deploy. For example -bin ~/my/project/bin/,~/my/project/bin.exe,~/my/project/runtimeLinking/lib.dll. For files: These files will be unconditional copied to the destination directory, regardless of their format or suffix. For folders: CQtDeployer will enter these folders and non-recursively copy all executable files to the destination directory. Then, CQtDeployer will extract all dependencies of the copied files and search dependencies in system environments and **libDir** paths. **Note**: If CQtDeployer can't find required file then CQtDeployer try find required file in the system PATH enviroment.|
 |   -binPrefix [prefixPath]   | Sets prefix path for bin option. Example: **-bin path/MyExecutable** is some as **-bin MyExecutable -binPrefix path** |
@@ -106,7 +106,7 @@ cqtdeployer -option1 value1 -option2 list, of, values ​​flag1 flag2 flag3
 
 ### Controll of packages options
 
-| Option                      | Descriptiion                                              |
+| Option                      | Description                                              |
 |-----------------------------|-----------------------------------------------------------|
 |  -targetPackage [package;tar1,package;tar2]| Creates a new package and adds 'tar1 and tar2' to it |
 |  -qmlOut [package;path,path] | Sets path to qml out directory                                  |
@@ -128,7 +128,7 @@ cqtdeployer -option1 value1 -option2 list, of, values ​​flag1 flag2 flag3
 
 ### Controll of targets options
 
-| Option                      | Descriptiion                                              |
+| Option                      | Description                                              |
 |-----------------------------|-----------------------------------------------------------|
 |  -icon [target;val,val]    | Sets path to icon for a targets. This option support only png (Linux) and ico (Windows) files.  |
 |  -disableRunScript [target,target2,target3]  | Disables the generation of run script for selected targets|
@@ -136,40 +136,40 @@ cqtdeployer -option1 value1 -option2 list, of, values ​​flag1 flag2 flag3
 |  -runScript [target;val,val]  | forces cqtdeployer swap default run script to new from the arguments of option. This option copy all content from input file and insert all code into runScript.sh or .bat. Example of use: cqtdeployer -runScript "myTargetMame;path/to/my/myCustomLaunchScript.sh,myTargetSecondMame;path/to/my/mySecondCustomLaunchScript.sh" For get more information about customScript see the documentation [page](CustomScripts.md)|
 |  -extraDepends [target;val,val]  | Adds extra dependencies for target, if package is skiped then for all targets. Example -extraDepends libssl.so or -extraDepends myExecutable;libssl.so           |
 
-### Plugins Controll Options
+### Plugins Control Options
  
-| Option                      | Descriptiion                                              |
+| Option                      | Description                                              |
 |-----------------------------|-----------------------------------------------------------|
 |  -extraPlugin [package;val1;val2,SingeleVal]| Sets an additional path to third-party application plug-in |
 |  -enablePlugins [package;val1;val2,SingeleVal] | Enables additional plugins for distribution.  |
 |  -disablePlugins [package;val1;val2,SingeleVal]| Disables plugins for distribution.            |
-|                    |You can disable any plugin of your Qt build, just see the yourQtFolder/plugins forlder for available plugins.|
+|                    |You can disable any plugin of your Qt build, just see the yourQtFolder/plugins folder for available plugins.|
 | |Example: if you want disable qxcb plugin: -disablePlugins qxcb. Note that the name of the plugin is indicated without its extension.|
 
 ### QtInstallFramework options
 
-| Option                      | Descriptiion                                              |
+| Option                      | Description                                              |
 |-----------------------------|-----------------------------------------------------------|
 |  -qifStyle [path/to/style.css]| Sets the path to the CSS style file or sets the default style. Available styles: quasar |
 |  -qifBanner [path/to/banner.png]| Sets path to the banner png file.                                      |
 |  -qifLogo [path/to/logo.png]| Sets path to the logo png file.                                |
 |  -qifOut [nameOfOutputInstallerFile] | Sets name of output qifw installer. Note: on Windows, the exe suffix will be added to the installer automatically.                |
-|  -qifConfig [path/to/config.xml] | Sets a custom path to the configure file of the qt ifw installer. By default it is qif/config/config.xml. Note This path sets releative target folder (sets by TargetDir option). |
+|  -qifConfig [path/to/config.xml] | Sets a custom path to the configure file of the qt ifw installer. By default it is qif/config/config.xml. Note This path sets relative target folder (sets by TargetDir option). |
-|  -qifPackages [path/to/packagesFodoler] | Sets a custom path to the packages directories. By default it is qif/packages. Note This path sets releative target folder (sets by TargetDir option). |
+|  -qifPackages [path/to/packagesFodoler] | Sets a custom path to the packages directories. By default it is qif/packages. Note This path sets relative target folder (sets by TargetDir option). |
-|  -qifResources [path/to/resources1.qrc,path/to/resources2.qrc] | Sets a custom path to the resources files. By default this option is skipped. Note This path sets releative target folder (sets by TargetDir option). |
+|  -qifResources [path/to/resources1.qrc,path/to/resources2.qrc] | Sets a custom path to the resources files. By default this option is skipped. Note This path sets relative target folder (sets by TargetDir option). |
 |  -qifArchiveFormat [7z,zip,tar,tar.gz,tar.bz2,tar.xz] | Sets the format used when packaging new component data archives. If you omit this option, the 7z format will be used as a default. |
 |  -binarycreator [binarycreator command] | Sets new binarycreator command. Example : cqtdeployer -bin my.exe qifw -binarycreator 'wine path/to/binarycreator.exe'|
 
 ### Deb package options
 
-| Option                      | Descriptiion                                              |
+| Option                      | Description                                              |
 |-----------------------------|-----------------------------------------------------------|
 |  -debOut [package;nameOfOutputDebFile,nameOfOutputDebFile]| Sets name of the output debian file. This option can be work with multiple packages |
 
 ### Zip pacakge options
 
-| Option                      | Descriptiion                                              |
+| Option                      | Description                                              |
 |-----------------------------|-----------------------------------------------------------|
-|  -zipOut [package;nameOfOutputZipFile,nameOfOutputZipFile]| Sets name of the output zip arrhive. This option can be work with multiple packages |
+|  -zipOut [package;nameOfOutputZipFile,nameOfOutputZipFile]| Sets name of the output zip archive. This option can be work with multiple packages |
 
 #### Example: cqtdeployer -bin myApp -qmlDir ~/MyAppProject/qml -qmake ~/Qt/5.15.4/gcc_64/bin/qmake clear

md/ru/CustomScripts.md

@@ -65,4 +65,4 @@ CQT_RUN_COMMAND
 ```
 
 
-Или вы можете получить последнюю версию этих скриптов из github [репозитория](https://github.com/QuasarApp/CQtDeployer/tree/main/Deploy/ScriptsTemplates).
+Или вы можете получить последнюю версию этих скриптов из github [репозитория](https://github.com/QuasarApp/CQtDeployer/tree/main/src/Deploy/src/ScriptsTemplates).

md/ru/Options.md

@@ -79,7 +79,7 @@ cqtdeployer -option1 value1 -option2 list,of,values flag1 flag2 flag3
 |-----------------------------|-----------------------------------------------------------|
 |  -bin    [list,params]     | Развертываемый файл или папка. пример -bin ~/my/project/bin/,~/my/project/bin.exe. Для файлов: эти файлы будут безоговорочно скопированы в целевой каталог, независимо от их формата или суффикса. Для папок: CQtDeployer войдет в эти папки и нерекурсивно скопирует все развертываемые файлы в целевой каталог. Затем CQtDeployer извлечет все зависимости скопированных файлов. CQtDeployer будет искать зависимости в системной среде и в путях libDir. **Примечание**. Если CQtDeployer не может найти требуемый файл, CQtDeployer попытается найти требуемый файл в системной среде PATH. |
 |   -binPrefix [prefixPath]   | Устанавливает путь префикса для опции bin. Пример: **-bin path/MyExecutable** - это тоже что и **-bin MyExecutable -binPrefix path**  |
-|  -confFile [params]         | Путь к файлу json со всеми конфигурациями развертывания. С помощью этого файла можно добавить нужные опции, тем самым упрастить вызов комманды в консоле. Однако пораметры в кансоле имеют больший приоритет чем в файле. Для получения дополнительной информации об этом флаге см. [Вики](DeployConfigFile) |
+|  -confFile [params]         | Путь к файлу json со всеми конфигурациями развертывания. С помощью этого файла можно добавить нужные опции, тем самым упрастить вызов комманды в консоли. Однако пораметры в консоли имеют больший приоритет чем в файле. Для получения дополнительной информации об этом флаге см. [Вики](DeployConfigFile) |
 |  -qmlDir [params]           | Папка qml. пример -qmlDir ~/my/project/qml                |
 |  -qmake  [params]           | Путь к qmake. пример                                      |
 |                             | -qmake ~/Qt/5.14.0/gcc_64/bin/qmake                       |

src/CQtDeployer/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021-2023 QuasarApp.
+# Copyright (C) 2021-2024 QuasarApp.
 # Distributed under the GPLv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.
@@ -57,19 +57,6 @@ if(QT_VERSION_MAJOR EQUAL 6)
 endif()
 
 
-set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/ru.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/uk.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/ja.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/tr.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/zh.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/de.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/fr.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/es.ts
-          ${CMAKE_CURRENT_SOURCE_DIR}/languages/pl.ts)
-
-prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}")
-
 # sets qifw variable
 set(ApplicationsDir "@HomeDir@")
 set(QIFW_PLATFORM linux)
@@ -122,5 +109,5 @@ if (UNIX)
         add_dependencies(snapcraft${CURRENT_PROJECT} "deploy${CURRENT_PROJECT}Single")
     endif()
 
-    addReleaseSnap(${CURRENT_PROJECT})
+    addReleaseSnap(${CURRENT_PROJECT} latest/edge)
 endif()

src/CQtDeployer/Deploy/snapcraft.yaml.in

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2023 QuasarApp.
+# Copyright (C) 2018-2024 QuasarApp.
 # Distributed under the lgplv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.

src/CQtDeployer/main.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 QuasarApp.
+# Copyright (C) 2020-2024 QuasarApp.
 # Distributed under the GPLv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.
@@ -36,12 +36,6 @@ target_link_libraries(${CURRENT_PROJECT} PUBLIC QuasarApp QtELFReader pe-parse z
 
 target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
 
-set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts)
-
-
-prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}")
-
-set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "" FORCE)
 
 configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/src/deploy_global.h")
 

src/Deploy/CQtDeployer.qrc

@@ -1,5 +1,3 @@
 <RCC>
-    <qresource prefix="/CQtDeployerTr">
+    <qresource prefix="/CQtDeployerTr"/>
-        <file>languages/en.qm</file>
-    </qresource>
 </RCC>

src/Deploy/src/Distributions/deb.cpp

@@ -28,7 +28,7 @@ bool Deb::deployTemplate(PackageControl &pkg) {
             QuasarAppUtils::Params::log("Using custom template for debian pacakge: " + customTemplate,
                                         QuasarAppUtils::Info);
 
-            auto availablePacakages = QDir(customTemplate).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+            auto availablePacakages = QDir(customTemplate).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden);
 
             for (const auto& pkg: availablePacakages) {
                 pakcagesTemplates.insert(pkg.fileName(), pkg.absoluteFilePath());

src/Deploy/src/Distributions/idistribution.cpp

@@ -108,7 +108,7 @@ bool iDistribution::unpackDir(const QString &resource,
 
 
     QDir res(resource);
-    auto list = res.entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries);
+    auto list = res.entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries | QDir::Hidden);
 
     for (const auto & item :list) {
 

src/Deploy/src/Distributions/qif.cpp

@@ -129,7 +129,7 @@ bool QIF::deployTemplate(PackageControl &pkg) {
         QuasarAppUtils::Params::log("Using custom template for installer: " + customTemplate,
                                     QuasarAppUtils::Info);
 
-        auto availablePacakages = QDir(customTemplate + "/packages").entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+        auto availablePacakages = QDir(customTemplate + "/packages").entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden);
 
         for (const auto& pkg: availablePacakages) {
             pakcagesTemplates.insert(pkg.fileName(), pkg.absoluteFilePath());
@@ -237,7 +237,7 @@ QString QIF::location(const DistroModule &module) const {
 
 QString QIF::getStyle(const QString& input) const {
     QDir resurces(":/Styles/Distributions/Templates/qif/Styles");
-    auto list = resurces.entryInfoList(QDir::Files);
+    auto list = resurces.entryInfoList(QDir::Files | QDir::Hidden);
     for (const auto& style : list) {
         if (input == style.baseName()) {
             QuasarAppUtils::Params::log(QString("Use the %0 installer style").arg(style.baseName()),

src/Deploy/src/configparser.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.
@@ -23,6 +23,7 @@
 #include <Distributions/defaultdistro.h>
 #include <Distributions/qif.h>
 #include <Distributions/ziparhive.h>
+#include <qaplatformutils.h>
 
 
 /**
@@ -707,7 +708,7 @@ bool ConfigParser::parseDeployMode(bool checkBin) {
         QuasarAppUtils::Params::log("Failed to initialize targets or extra data!",
                                     QuasarAppUtils::Error);
 
-        QuasarAppUtils::Params::log("Use bin or extraData optins. And check input pathes.",
+        QuasarAppUtils::Params::log("Use bin or extraData options and check input paths.",
                                     QuasarAppUtils::Info);
         return false;
     }
@@ -740,7 +741,7 @@ bool ConfigParser::parseDeployMode(bool checkBin) {
 
     if (!initQmake()) {
 
-        if (DeployCore::isSnap()) {
+        if (QuasarAppUtils::PlatformUtils::isSnap()) {
             QuasarAppUtils::Params::log("If you are using qmake from the system repository,"
                                         " then you must use the classic version of CQtDeployer instead of the snap version."
                                         " This is due to the fact that the snap version"
@@ -960,9 +961,9 @@ bool ConfigParser::setTargetsInDir(const QString &dir, bool recursive) {
     QFileInfoList list;
 
     if (recursive) {
-        list = d.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
+        list = d.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden);
     } else {
-        list = d.entryInfoList(QDir::Files | QDir::NoDotAndDotDot);
+        list = d.entryInfoList(QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden);
     }
 
     bool result = false;
@@ -1024,9 +1025,11 @@ void ConfigParser::initIgnoreList()
     envUnix.addEnv(Envirement::recursiveInvairement("/lib", 3));
     envUnix.addEnv(Envirement::recursiveInvairement("/usr/lib", 3));
 
-    if (DeployCore::isSnap()) {
+    if (QuasarAppUtils::PlatformUtils::isSnap()) {
-        envUnix.addEnv(Envirement::recursiveInvairement(DeployCore::transportPathToSnapRoot("/lib"), 3));
+        envUnix.addEnv(Envirement::recursiveInvairement(
-        envUnix.addEnv(Envirement::recursiveInvairement(DeployCore::transportPathToSnapRoot("/usr/lib"), 3));
+            QuasarAppUtils::PlatformUtils::transportPathToSnapRoot("/lib"), 3));
+        envUnix.addEnv(Envirement::recursiveInvairement(
+            QuasarAppUtils::PlatformUtils::transportPathToSnapRoot("/usr/lib"), 3));
     }
 
     ruleUnix.prority = SystemLib;
@@ -1113,7 +1116,7 @@ void ConfigParser::initIgnoreEnvList() {
     }
 
     // forbid pathes of the snap container
-    if (DeployCore::isSnap()) {
+    if (QuasarAppUtils::PlatformUtils::isSnap()) {
         ignoreEnvList.push_back("/lib");
         ignoreEnvList.push_back("/usr/lib");
     }
@@ -1134,7 +1137,7 @@ QString ConfigParser::getPathFrmoQmakeLine(const QString &in) const {
     auto list = in.split(':');
     if (list.size() > 1) {
         list.removeAt(0);
-        return DeployCore::transportPathToSnapRoot(
+        return QuasarAppUtils::PlatformUtils::transportPathToSnapRoot(
                     QFileInfo(list.join(':')).absoluteFilePath().remove('\r'));
     }
 
@@ -1151,7 +1154,7 @@ bool ConfigParser::initQmakePrivate(const QString &qmake) {
 
     // Invoke qmake executable only when qmake paths exclude snapRootFS path.
     // Because files in snapRootFS is not executable ...
-    if (!qmake.contains(DeployCore::snapRootFS()) && setQmake(qmake)) {
+    if (!qmake.contains(QuasarAppUtils::PlatformUtils::snapRootFS()) && setQmake(qmake)) {
         return true;
     }
 
@@ -1167,8 +1170,8 @@ bool ConfigParser::initQmakePrivate(const QString &qmake) {
         QString debianQtRoot = QString("/usr/lib/%0/qt%1").
                                arg(neededPlatform).arg(qtVersion);
 
-        if (DeployCore::isSnap()) {
+        if (QuasarAppUtils::PlatformUtils::isSnap()) {
-            debianQtRoot = DeployCore::snapRootFS() + debianQtRoot;
+            debianQtRoot = QuasarAppUtils::PlatformUtils::snapRootFS() + debianQtRoot;
         }
 
         if (!setQtDir(debianQtRoot)) {
@@ -1189,7 +1192,7 @@ bool ConfigParser::initQmakePrivate(const QString &qmake) {
     }
 
     // For snap package of cqtdeplyer it is normal behavior
-    if (!DeployCore::isSnap()) {
+    if (!QuasarAppUtils::PlatformUtils::isSnap()) {
         QuasarAppUtils::Params::log("Failed to execute the qmake process!"
                                     " Trying to initialize Qt directories from path: " + dir.absolutePath(),
                                     QuasarAppUtils::Warning);
@@ -1214,7 +1217,8 @@ bool ConfigParser::initQmake() {
         return true;
     }
 
-    auto qmake = DeployCore::transportPathToSnapRoot(QuasarAppUtils::Params::getArg("qmake"));
+    auto qmake = QuasarAppUtils::PlatformUtils::transportPathToSnapRoot(
+        QuasarAppUtils::Params::getArg("qmake"));
 
     QFileInfo info(qmake);
 
@@ -1409,7 +1413,7 @@ bool ConfigParser::initExtraPath() {
     QDir dir;
 
     for (const auto &i : listLibDir) {
-        QFileInfo info(DeployCore::transportPathToSnapRoot(i));
+        QFileInfo info(QuasarAppUtils::PlatformUtils::transportPathToSnapRoot(i));
         if (info.isDir()) {
             if (_config.targets().contains(info.absoluteFilePath())) {
                 QuasarAppUtils::Params::log("Skip the extra library path because it is target!",
@@ -1563,7 +1567,7 @@ void ConfigParser::initEnvirement() {
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
     auto path = env.value("PATH");
 
-    if (!DeployCore::isSnap()) {
+    if (!QuasarAppUtils::PlatformUtils::isSnap()) {
 
         _config.envirement.addEnv(env.value("LD_LIBRARY_PATH"));
         _config.envirement.addEnv(path);
@@ -1572,8 +1576,8 @@ void ConfigParser::initEnvirement() {
     QStringList dirs;
 #ifdef Q_OS_LINUX
 
-    dirs.append(getDirsRecursive(DeployCore::transportPathToSnapRoot("/lib"), 5));
+    dirs.append(getDirsRecursive(QuasarAppUtils::PlatformUtils::transportPathToSnapRoot("/lib"), 5));
-    dirs.append(getDirsRecursive(DeployCore::transportPathToSnapRoot("/usr/lib"), 5));
+    dirs.append(getDirsRecursive(QuasarAppUtils::PlatformUtils::transportPathToSnapRoot("/usr/lib"), 5));
 
 #else
     auto winPath = findWindowsPath(path);
@@ -1592,14 +1596,14 @@ void ConfigParser::initEnvirement() {
 
 bool ConfigParser::checkSnapPermisions() {
 
-    if (!DeployCore::isSnap())
+    if (!QuasarAppUtils::PlatformUtils::isSnap())
         return true;
 
 
     bool system = QuasarAppUtils::Params::isEndable("deploySystem") ||
             QuasarAppUtils::Params::isEndable("extraLibs");
 
-    if (system && !DeployCore::checkSystemBakupSnapInterface()) {
+    if (system && !QuasarAppUtils::PlatformUtils::checkSystemBakupSnapInterface()) {
 
         QuasarAppUtils::Params::log("You use a deploySystem or extraLibs options,"
                                     " but not added permision system-backup for cqtdeployer."
@@ -1635,7 +1639,7 @@ QSet<QString> ConfigParser::getSetDirsRecursive(const QString &path, int maxDepc
         return res;
     }
 
-    auto list = dir.entryInfoList(QDir::Dirs| QDir::NoDotAndDotDot);
+    auto list = dir.entryInfoList(QDir::Dirs| QDir::NoDotAndDotDot | QDir::Hidden);
 
     for (const auto &subDir: list) {
         res.insert(subDir.absoluteFilePath());

src/Deploy/src/configparser.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/defines.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/dependenciesscanner.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/dependenciesscanner.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/dependencymap.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/dependencymap.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/deploy.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/deploy.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/deploy_global.h.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/deployconfig.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/deployconfig.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/deploycore.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.
@@ -16,6 +16,7 @@
 #include <QProcess>
 #include <configparser.h>
 #include <iostream>
+#include <qaplatformutils.h>
 
 //QString DeployCore::qtDir = "";
 //QStringList DeployCore::extraPaths = QStringList();
@@ -253,7 +254,13 @@ QuasarAppUtils::OptionsDataList DeployCore::avilableOptions() {
                             {"deb", "-deb"}, "",
                             "Create the deb package for deployment programm"
                             " You can specify the path to your own debian template.",
-                            "cqtdeployer -deb path/to/myCustom/DEBIAN."
+                            " cqtdeployer -deb path/to/myCustom/templates"
+                            " Where: the custom path should point to a folder with your packages templates, and template name should match with real package name."
+                            " For Exmaple: cqtdeployer -deb path/to/tempalates -name appnameOrPackageName "
+                            " path/to/tempalates/appnameOrPackageName/DEBIAN"
+                            " To get more information see documentation page "
+                            "https://quasarapp.ddns.net:3031/docs/QuasarApp/CQtDeployer/latest/md_md_2en_2DEB.html"
+
                         }});
     help.insert(group, {QuasarAppUtils::OptionData{
                             {"deploySystem"}, "",
@@ -609,7 +616,7 @@ QString DeployCore::getAppVersion() {
 }
 
 QString DeployCore::getAppVersionName() {
-    if (isSnap()) {
+    if (QuasarAppUtils::PlatformUtils::isSnap()) {
         return "*** Cool Core (snap) ***";
     }
     return "*** Cool Core ***";
@@ -645,7 +652,7 @@ bool DeployCore::isContainsArraySeparators(const QString &val, int lastLvl) {
 QString DeployCore::findProcess(const QString &env, const QString& proc, bool ignoreSymLinks) {
     auto list = env.split(DeployCore::getEnvSeparator());
 
-    auto findEntries = QDir::NoDotAndDotDot | QDir::Files;
+    auto findEntries = QDir::NoDotAndDotDot | QDir::Files | QDir::Hidden;
     if (ignoreSymLinks) {
         findEntries = findEntries | QDir::NoSymLinks;
     }
@@ -661,9 +668,10 @@ QString DeployCore::findProcess(const QString &env, const QString& proc, bool ig
     }
 
     // working only for the snap version of cqtdeployer ...
-    if (isSnap()) {
+    if (QuasarAppUtils::PlatformUtils::isSnap()) {
         for (const auto& path : list) {
-            auto files = QDir(transportPathToSnapRoot(path)).entryInfoList(findEntries);
+            auto files = QDir(QuasarAppUtils::PlatformUtils::transportPathToSnapRoot(path)).
+                         entryInfoList(findEntries);
 
             for (const auto& bin : files) {
                 if (bin.baseName().compare(proc, DeployCore::getCaseSensitivity()) == 0) {
@@ -771,7 +779,7 @@ QString DeployCore::getVCredist(const QString &_qtbinDir) {
         return "";
     }
 
-    auto infoList = dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot);
+    auto infoList = dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden);
 
     auto name = getMSVCName(msvc);
     auto version = getMSVCVersion(msvc);
@@ -1006,40 +1014,6 @@ char DeployCore::getEnvSeparator() {
 #endif
 }
 
-bool DeployCore::isSnap() {
-    return QProcessEnvironment::systemEnvironment().value("SNAP").size();
-}
-
-QString DeployCore::snapRootFS() {
-    return "/var/lib/snapd/hostfs";
-}
-
-QString DeployCore::transportPathToSnapRoot(const QString &path) {
-    if (isSnap() && checkSystemBakupSnapInterface()) {
-
-        if(QFileInfo(path).isWritable()) {
-            return path;
-        }
-
-        if (path.size() && path[0] != QString("/")) {
-            auto absalutPath = QProcessEnvironment::systemEnvironment().value("PWD") + "/" + path;
-            if (!absalutPath.contains(DeployCore::snapRootFS())) {
-                return snapRootFS() + "/" + absalutPath;
-            }
-        }
-
-        if (!path.contains(DeployCore::snapRootFS())) {
-            return snapRootFS() + "/" + path;
-        }
-    }
-
-    return path;
-}
-
-bool DeployCore::checkSystemBakupSnapInterface() {
-    return QDir(DeployCore::snapRootFS()).entryList(QDir::AllEntries | QDir::NoDotAndDotDot).size();
-}
-
 void DeployCore::printInternalError(const char * function, const char* file, int line ) {
     QuasarAppUtils::Params::log(QString("Internal error ocurred in %0 (%1:%2).").arg(function, file).arg(line),
                                 QuasarAppUtils::Error);

src/Deploy/src/deploycore.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.
@@ -283,11 +283,6 @@ public:
     static QStringList debugExtensions();
     static bool isDebugFile(const QString& file);
 
-    static bool isSnap();
-    static QString snapRootFS();
-    static QString transportPathToSnapRoot(const QString &path);
-    static bool checkSystemBakupSnapInterface();
-
     /**
      * @brief getLibCoreName This method remove platfomr specificly prefixes and sufixes of the librarry.
      *  Example : getLibCoreName(libTest.so) return Test

src/Deploy/src/distromodule.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.
@@ -8,6 +8,7 @@
 #include "deployconfig.h"
 #include "deploycore.h"
 #include "distromodule.h"
+#include <qaplatformutils.h>
 
 DistroModule::DistroModule(const QString& key) {
     setKey(key);
@@ -34,7 +35,7 @@ void DistroModule::setQmlInput(const QSet<QString> &qmlInput) {
 }
 
 void DistroModule::addQmlInput(const QString &target) {
-    _qmlInput.insert(DeployCore::transportPathToSnapRoot(target));
+    _qmlInput.insert(QuasarAppUtils::PlatformUtils::transportPathToSnapRoot(target));
 }
 
 QString DistroModule::name() const {
@@ -110,7 +111,7 @@ void DistroModule::setExtraPlugins(const QSet<QString> &extraPlugins) {
 }
 
 void DistroModule::addExtraPlugins(const QString &extraPlugin) {
-    _extraPlugins += DeployCore::transportPathToSnapRoot(extraPlugin);
+    _extraPlugins += QuasarAppUtils::PlatformUtils::transportPathToSnapRoot(extraPlugin);
 
 }
 

src/Deploy/src/distromodule.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/distrostruct.cpp

@@ -1,6 +1,6 @@
 
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/distrostruct.h

@@ -1,6 +1,6 @@
 
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/elf_type.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.
@@ -66,9 +66,10 @@ QString ELF::extractRPath(ElfReader& reader) const {
             for (const auto &path: pathes) {
                 if (path.contains("/")) {
                     if (result.size()) {
-                        result += DeployCore::getEnvSeparator() + DeployCore::transportPathToSnapRoot(path);
+                        result += DeployCore::getEnvSeparator() +
+                                  QuasarAppUtils::PlatformUtils::transportPathToSnapRoot(path);
                     } else {
-                        result += DeployCore::transportPathToSnapRoot(path);
+                        result += QuasarAppUtils::PlatformUtils::transportPathToSnapRoot(path);
                     }
                 }
             }

src/Deploy/src/elf_type.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/envirement.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.
@@ -133,7 +133,7 @@ QStringList Envirement::recursiveInvairement(QDir &dir, int depch, int depchLimi
         return {dir.absolutePath()};
     }
 
-    QFileInfoList list = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+    QFileInfoList list = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden);
     QStringList res = {};
 
     for (QFileInfo &i : list) {

src/Deploy/src/envirement.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/extra.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/extra.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/extracter.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.
@@ -357,7 +357,7 @@ bool Extracter::copyTranslations(const QStringList &list, const QString& package
         filters.push_back("*" + i + "*");
     }
 
-    auto listItems = dir.entryInfoList(filters, QDir::Files | QDir::NoDotAndDotDot);
+    auto listItems = dir.entryInfoList(filters, QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden);
 
     auto targetPath = cnf->getTargetDir() + "/" + package;
     auto distro = cnf->getDistroFromPackage(package);
@@ -383,7 +383,7 @@ QFileInfoList Extracter::findFilesInsideDir(const QString &name,
 
     QDir dir(dirpath);
 
-    auto list = dir.entryInfoList( QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
+    auto list = dir.entryInfoList( QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden);
 
     for (const auto & item :list) {
         if (item.isFile()) {
@@ -501,7 +501,7 @@ bool Extracter::extractQml() {
                 }
             } else {
                 for (const auto& plugin: std::as_const(plugins)) {
-                    const auto qmlFiles = QDir(plugin).entryInfoList(QDir::Files);
+                    const auto qmlFiles = QDir(plugin).entryInfoList(QDir::Files | QDir::Hidden);
                     for (const auto& qmlFile: qmlFiles) {
                         toCopyQmlFiles.push_back(qmlFile.absoluteFilePath());
                     }

src/Deploy/src/extracter.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/filemanager.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.
@@ -142,7 +142,7 @@ bool FileManager::strip(const QString &dir) const {
 
     if (info.isDir()) {
         QDir d(dir);
-        auto list = d.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
+        auto list = d.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden);
 
         bool res = false;
         for (const auto &i : list) {
@@ -298,7 +298,7 @@ bool FileManager::copyFolder(const QString &from,
 
     QDir fromDir(from);
 
-    auto list = fromDir.entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries);
+    auto list = fromDir.entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries | QDir::Hidden);
 
     for (const auto &item : list) {
         if (item.isDir()) {
@@ -402,7 +402,7 @@ bool FileManager::moveFolder(const QString &from, const QString &to, const QStri
     }
 
     QDir dir(from);
-    auto list = dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
+    auto list = dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden);
     for (const auto &i :list) {
         auto targetDir = to;
         if (i.isDir()) {

src/Deploy/src/filemanager.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/generalfiles_type.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2023 QuasarApp.
+//# Copyright (C) 2021-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/generalfiles_type.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2021-2023 QuasarApp.
+//# Copyright (C) 2021-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/igetlibinfo.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/ignorerule.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/ignorerule.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/iqml.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2022-2023 QuasarApp.
+//# Copyright (C) 2022-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/iqml.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2022-2023 QuasarApp.
+//# Copyright (C) 2022-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/libinfo.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/libinfo.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/metafilemanager.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/metafilemanager.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/packagecontrol.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/packagecontrol.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/packing.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/packing.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/pathutils.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/pathutils.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/pe_type.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/pe_type.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/pluginsparser.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.
@@ -36,8 +36,10 @@ static const PluginModuleMapping pluginModuleMappings[] =
     {"audio", DeployCore::QtModule::QtMultimediaModule},
     {"mediaservice", DeployCore::QtModule::QtMultimediaModule},
     {"playlistformats", DeployCore::QtModule::QtMultimediaModule},
+    {"multimedia", DeployCore::QtModule::QtMultimediaModule},
     {"bearer", DeployCore::QtModule::QtNetworkModule},
     {"tls", DeployCore::QtModule::QtNetworkModule},
+    {"networkinformation", DeployCore::QtModule::QtNetworkModule},
     {"position", DeployCore::QtModule::QtPositioningModule},
     {"printsupport", DeployCore::QtModule::QtPrintSupportModule},
     {"scenegraph", DeployCore::QtModule::QtQuickModule},
@@ -55,8 +57,8 @@ static const PluginModuleMapping pluginModuleMappings[] =
     {"geometryloaders", DeployCore::QtModule::Qt3DRendererModule},
     {"webview", DeployCore::QtModule::QtWebViewModule},
     {"xcbglintegrations", DeployCore::QtModule::QtGuiModule},
-    {"wayland-decoration-client", DeployCore::QtModule::QtQuickModule},
+    {"wayland-decoration-client", DeployCore::QtModule::QtGuiModule},
-    {"wayland-graphics-integration-client", DeployCore::QtModule::QtQuickModule},
+    {"wayland-graphics-integration-client", DeployCore::QtModule::QtGuiModule},
     {"wayland-graphics-integration-server", DeployCore::QtModule::QtQuickModule},
     {"wayland-shell-integration", DeployCore::QtModule::QtGuiModule},
 
@@ -151,7 +153,7 @@ bool PluginsParser::scan(const QString& pluginPath,
                          DeployCore::QtModule qtModules,
                          const QString& package) {
 
-    auto plugins = QDir(pluginPath).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+    auto plugins = QDir(pluginPath).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden);
     for (const auto &plugin: plugins) {
         scanPluginGroup(plugin, resDependencies, package, qtModules);
     }
@@ -165,7 +167,7 @@ void PluginsParser::addPlugins(const QStringList& list, const QString& package,
 
     for (const auto &plugin: std::as_const(list)) {
         if (QFileInfo(cnf->qtDir.getPlugins() + "/" + plugin).isDir()) {
-             auto listPlugins = QDir(cnf->qtDir.getPlugins() + "/" + plugin).entryInfoList(QDir::Files | QDir::NoDotAndDotDot);
+             auto listPlugins = QDir(cnf->qtDir.getPlugins() + "/" + plugin).entryInfoList(QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden);
 
              for (const auto &plugin: listPlugins) {
                  container[package].insert(getPluginNameFromFile( plugin.baseName()));
@@ -209,7 +211,7 @@ void PluginsParser::scanPlatforms(const QString& package, QList<QString>& disabl
     auto platform = cnf->getPlatform(package);
 
     QString platformPluginPath = cnf->qtDir.getPlugins() + "/platforms";
-    auto plugins = QDir(platformPluginPath).entryInfoList(QDir::Files | QDir::NoDotAndDotDot);
+    auto plugins = QDir(platformPluginPath).entryInfoList(QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden);
 
     for (const auto &plugin: plugins) {
 
@@ -227,7 +229,7 @@ void PluginsParser::scanPluginGroup(const QFileInfo& plugin,
                                     const QString &package,
                                     DeployCore::QtModule qtModules) const {
 
-    auto plugins = QDir(plugin.absoluteFilePath()).entryInfoList(QDir::Files | QDir::NoDotAndDotDot);
+    auto plugins = QDir(plugin.absoluteFilePath()).entryInfoList(QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden);
     auto groupModule = qtModuleForPluginGroup(plugin.fileName());
 
     for (const auto& info: plugins) {

src/Deploy/src/pluginsparser.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/qmlqt5.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/qmlqt5.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/qmlqt6.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.
@@ -47,7 +47,7 @@ QStringList QMLQt6::extractImportsFromFile(const QString &filepath) const {
         {
             word = word.simplified();
             if (word.startsWith("//")) continue;
-            if (!word.startsWith("import")) continue;
+            if (!word.startsWith("import ")) continue;
 
             imports += extractImportLine(word);
         }

src/Deploy/src/qmlqt6.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/qtdir.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/qtdir.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/targetdata.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/targetinfo.cpp

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/targetinfo.h

@@ -1,5 +1,5 @@
 //#
-//# Copyright (C) 2018-2023 QuasarApp.
+//# Copyright (C) 2018-2024 QuasarApp.
 //# Distributed under the lgplv3 software license, see the accompanying
 //# Everyone is permitted to copy and distribute verbatim copies
 //# of this license document, but changing it is not allowed.

src/Deploy/src/zipcompresser.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/Deploy/src/zipcompresser.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

src/QtELFReader/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 QuasarApp.
+# Copyright (C) 2020-2024 QuasarApp.
 # Distributed under the GPLv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.

src/QtELFReader/src/elfreader_global.h.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

submodules/QuasarAppLib

@@ -1 +1 @@
-Subproject commit 3b797f9a7883bec4083dc8abf6159b0146f313d3
+Subproject commit 33b3112d5827a02099925dcb4d825b0ac04b951d

submodules/zip

@@ -1 +1 @@
-Subproject commit fefb8d6acc78b5f63d5a78b86a4900e694bd2862
+Subproject commit 81314fff0a882b72a9ad321e7a3311660125b56e

testcases/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 QuasarApp.
+# Copyright (C) 2020-2024 QuasarApp.
 # Distributed under the GPLv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.
@@ -18,6 +18,9 @@ add_subdirectory(TestQtWidgets)
 if (NOT WIN32)
     add_subdirectory(QMLFileDialog)
     add_subdirectory(virtualkeyboard)
-    add_subdirectory(quicknanobrowser)
+
-    add_subdirectory(webui)
+    if (Qt${QT_VERSION_MAJOR}WebEngineQuick_FOUND)
+        add_subdirectory(quicknanobrowser)
+        add_subdirectory(webui)
+    endif()
 endif()

testcases/TestQMLWidgets/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021-2023 QuasarApp.
+# Copyright (C) 2021-2024 QuasarApp.
 # Distributed under the GPLv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.

testcases/TestQtWidgets/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021-2023 QuasarApp.
+# Copyright (C) 2021-2024 QuasarApp.
 # Distributed under the GPLv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.

tests/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 QuasarApp.
+# Copyright (C) 2020-2024 QuasarApp.
 # Distributed under the GPLv3 software license, see the accompanying
 # Everyone is permitted to copy and distribute verbatim copies
 # of this license document, but changing it is not allowed.
@@ -47,6 +47,10 @@ set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/modules"
 add_definitions(-DQT_BASE_DIR="${QT_QT_ROOT}/")
 add_definitions(-DTEST_BIN_DIR="${CMAKE_CURRENT_LIST_DIR}/../testcases/bin/")
 
+if (Qt${QT_VERSION_MAJOR}WebEngineQuick_FOUND)
+    add_definitions(-DUSE_WEBENGINE)
+endif()
+
 add_executable(${CURRENT_PROJECT} ${SOURCE_CPP})
 target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test Deploy)
 

tests/modules/modulesqt513.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

tests/modules/modulesqt513.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

tests/modules/modulesqt514.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

tests/modules/modulesqt514.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

tests/modules/modulesqt515.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2023 QuasarApp.
+ * Copyright (C) 2023-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

tests/modules/modulesqt515.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

tests/modules/modulesqt5152.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2023 QuasarApp.
+ * Copyright (C) 2023-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

tests/modules/modulesqt5152.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

tests/modules/modulesqt6_3.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2023 QuasarApp.
+ * Copyright (C) 2023-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.
@@ -407,6 +407,7 @@ QSet<QString> ModulesQt63::qmlLibs(const QString &distDir) const {
              "./" + distDir + "/plugins/tls/qcertonlybackend.dll",
              "./" + distDir + "/plugins/tls/qopensslbackend.dll",
              "./" + distDir + "/plugins/tls/qschannelbackend.dll",
+             "./" + distDir + "/plugins/networkinformation/qnetworklistmanager.dll",
             "./" + distDir + "/translations/qtdeclarative_ar.qm",
             "./" + distDir + "/translations/qtdeclarative_bg.qm",
             "./" + distDir + "/translations/qtdeclarative_ca.qm",
@@ -452,12 +453,7 @@ QSet<QString> ModulesQt63::qmlLibs(const QString &distDir) const {
                     "./" + distDir + "/lib/libQt6WaylandEglCompositorHwIntegration.so",
                     "./" + distDir + "/plugins/tls/libqcertonlybackend.so",
                     "./" + distDir + "/plugins/tls/libqopensslbackend.so",
-                    "./" + distDir + "/plugins/wayland-decoration-client/libbradient.so",
+                    "./" + distDir + "/plugins/networkinformation/libqnetworkmanager.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",
@@ -992,6 +988,12 @@ QSet<QString> ModulesQt63::qtLibs(const QString &distDir) const {
                 "./" + distDir + "/plugins/wayland-shell-integration/libqt-shell.so",
                 "./" + distDir + "/plugins/wayland-shell-integration/libwl-shell-plugin.so",
                 "./" + distDir + "/plugins/wayland-shell-integration/libxdg-shell.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/xcbglintegrations/libqxcb-egl-integration.so",
                 "./" + distDir + "/plugins/xcbglintegrations/libqxcb-glx-integration.so",
                 "./" + distDir + "/translations/qtbase_ar.qm",
@@ -1237,6 +1239,7 @@ QSet<QString> ModulesQt63::qtWebEngineWidgets(const QString &distDir) const {
                     "./" + distDir + "/plugins/printsupport/libcupsprintersupport.so",
                     "./" + distDir + "/plugins/tls/libqcertonlybackend.so",
                     "./" + distDir + "/plugins/tls/libqopensslbackend.so",
+                    "./" + distDir + "/plugins/networkinformation/libqnetworkmanager.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",

tests/modules/modulesqt6_3.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

tests/modules/modulesqt6_4.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2023 QuasarApp.
+ * Copyright (C) 2023-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

tests/modules/modulesqt6_4.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 QuasarApp.
+ * Copyright (C) 2018-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

tests/modules/modulesqt6_5.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2023 QuasarApp.
+ * Copyright (C) 2023-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.
@@ -22,7 +22,7 @@ QSet<QString> ModulesQt6_5::qmlLibs(const QString &distDir) const {
             "./" + distDir + "/qml/QtQml/libqmlplugin.so",
             "./" + distDir + "/qml/QtQml/plugins.qmltypes"
         }
-    );
+        );
 
 #ifdef Q_OS_WIN
     Tree += utils.createTree(
@@ -43,6 +43,7 @@ QSet<QString> ModulesQt6_5::qmlLibs(const QString &distDir) const {
             "./" + distDir + "/qml/QtQml/Base/plugins.qmltypes",
             "./" + distDir + "/qml/QtQml/Base/qmldir",
             "./" + distDir + "/qml/QtQml/libqmlmetaplugin.so",
+            "./" + distDir + "/plugins/networkinformation/libqglib.so",
             "./" + distDir + "/qml/QtQuick/Controls/Material/impl/RoundedElevationEffect.qml"
         }
         );
@@ -56,6 +57,22 @@ QSet<QString> ModulesQt6_5::qmlVirtualKeyBoadrLibs(const QString &distDir) const
     TestUtils utils;
 
     auto Tree = ModulesQt6_4::qmlVirtualKeyBoadrLibs(distDir);
+
+#ifdef Q_OS_WIN
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "/plugins/multimedia/ffmpegmediaplugin.dll",
+            "./" + distDir + "/plugins/multimedia/windowsmediaplugin.dll"
+        }
+        );
+#else
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "/plugins/multimedia/libffmpegmediaplugin.so",
+            "./" + distDir + "/plugins/multimedia/libgstreamermediaplugin.so"
+        }
+        );
+#endif
     return Tree;
 }
 
@@ -77,6 +94,7 @@ QSet<QString> ModulesQt6_5::qtLibs(const QString &distDir) const {
             "./" + distDir + "/plugins/platforms/qdirect2d.dll",
         }
         );
+
 #endif
 
     return Tree;
@@ -88,5 +106,14 @@ QSet<QString> ModulesQt6_5::qtWebEngineWidgets(const QString &distDir) const
 
     auto Tree = ModulesQt6_4::qtWebEngineWidgets(distDir);
 
+#ifdef Q_OS_LINUX
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "/plugins/networkinformation/libqglib.so",
+        }
+        );
+#endif
+
+
     return Tree;
 }

tests/modules/modulesqt6_5.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2023 QuasarApp.
+ * Copyright (C) 2023-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

tests/modules/modulesqt6_6.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2023 QuasarApp.
+ * Copyright (C) 2023-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.
@@ -16,12 +16,6 @@ QSet<QString> ModulesQt6_6::qmlLibs(const QString &distDir) const {
     TestUtils utils;
     auto Tree = ModulesQt6_5::qmlLibs(distDir);
 
-#ifdef Q_OS_WIN
-
-#else
-
-#endif
-
     return Tree;
 }
 

tests/modules/modulesqt6_6.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2023 QuasarApp.
+ * Copyright (C) 2023-2024 QuasarApp.
  * Distributed under the lgplv3 software license, see the accompanying
  * Everyone is permitted to copy and distribute verbatim copies
  * of this license document, but changing it is not allowed.

tests/modules/modulesqt6_8.cpp

@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2023-2024 QuasarApp.
+ * Distributed under the lgplv3 software license, see the accompanying
+ * Everyone is permitted to copy and distribute verbatim copies
+ * of this license document, but changing it is not allowed.
+ */
+
+
+#include "modulesqt6_8.h"
+
+ModulesQt6_8::ModulesQt6_8() {}
+
+QSet<QString> ModulesQt6_8::qmlLibs(const QString &distDir) const {
+    TestUtils utils;
+    auto Tree = ModulesQt6_6::qmlLibs(distDir);
+
+#ifdef Q_OS_LINUX
+    Tree -= utils.createTree(
+        {
+            "./" + distDir + "/qml/QtQml/Base/libqmlplugin.so" ,
+            "./" + distDir + "/qml/QtQml/Base/plugins.qmltypes" ,
+            "./" + distDir + "/qml/QtQml/Base/qmldir",
+            "./" + distDir + "/qml/QtQml/libqmlmetaplugin.so",
+            "./" + distDir + "/qml/QtQuick/Controls/Imagine/impl/qtquickcontrols2imaginestyleimplplugin.qmltypes" ,
+        }
+        );
+
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "//lib/libQt6Network.so",
+            "./" + distDir + "//lib/libQt6QmlMeta.so",
+            "./" + distDir + "//lib/libQt6QuickControls2Basic.so",
+            "./" + distDir + "//lib/libQt6QuickControls2BasicStyleImpl.so",
+            "./" + distDir + "//lib/libQt6QuickControls2FluentWinUI3StyleImpl.so",
+            "./" + distDir + "//lib/libQt6QuickControls2Fusion.so",
+            "./" + distDir + "//lib/libQt6QuickControls2FusionStyleImpl.so",
+            "./" + distDir + "//lib/libQt6QuickControls2Imagine.so",
+            "./" + distDir + "//lib/libQt6QuickControls2ImagineStyleImpl.so",
+            "./" + distDir + "//lib/libQt6QuickControls2Material.so",
+            "./" + distDir + "//lib/libQt6QuickControls2MaterialStyleImpl.so",
+            "./" + distDir + "//lib/libQt6QuickControls2Universal.so",
+            "./" + distDir + "//lib/libQt6QuickControls2UniversalStyleImpl.so",
+            "./" + distDir + "//lib/libQt6QuickEffects.so",
+            "./" + distDir + "//lib/libQt6QuickLayouts.so",
+            "./" + distDir + "//qml/QML/plugins.qmltypes",
+            "./" + distDir + "//qml/QML/qmldir",
+            "./" + distDir + "//qml/QtQml/libqmlplugin.so",
+            "./" + distDir + "//qml/QtQml/plugins.qmltypes",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ApplicationWindow.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/BusyIndicator.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Button.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/CheckBox.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/CheckDelegate.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ComboBox.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Config.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/DelayButton.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Dialog.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/DialogButtonBox.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/FocusFrame.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Frame.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/GroupBox.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ItemDelegate.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Menu.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/MenuBar.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/MenuBarItem.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/MenuItem.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/MenuSeparator.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/PageIndicator.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Popup.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ProgressBar.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/RadioButton.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/RadioDelegate.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/RangeSlider.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/RoundButton.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Slider.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/SpinBox.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/StyleImage.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/SwipeDelegate.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Switch.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/SwitchDelegate.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/TabBar.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/TabButton.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/TextArea.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/TextField.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ToolBar.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ToolButton.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ToolSeparator.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ToolTip.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/ButtonBackground.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/CheckIndicator.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/RadioIndicator.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/SwitchIndicator.qml",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/libqtquickcontrols2fluentwinui3styleimplplugin.so",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/plugins.qmltypes",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/qmldir",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/libqtquickcontrols2fluentwinui3styleplugin.so",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/plugins.qmltypes",
+            "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/qmldir",
+            "./" + distDir + "//qml/QtQuick/Controls/Imagine/impl/QuickControls2ImagineStyleImpl.qmltypes",
+            "./" + distDir + "//qml/QtQuick/Effects/libeffectsplugin.so",
+            "./" + distDir + "//qml/QtQuick/Effects/plugins.qmltypes",
+            "./" + distDir + "//qml/QtQuick/Effects/qmldir",
+            "./" + distDir + "//qml/QtQuick/Layouts/libqquicklayoutsplugin.so",
+            "./" + distDir + "//qml/QtQuick/Layouts/plugins.qmltypes",
+            "./" + distDir + "//qml/QtQuick/Layouts/qmldir",
+            "./" + distDir + "//translations/qtdeclarative_ka.qm"
+        }
+        );
+#endif
+
+    return Tree;
+}
+
+QSet<QString> ModulesQt6_8::qmlVirtualKeyBoadrLibs(const QString &distDir) const{
+    TestUtils utils;
+
+    auto Tree = ModulesQt6_6::qmlVirtualKeyBoadrLibs(distDir);
+#ifdef Q_OS_LINUX
+    Tree -= utils.createTree(
+        {
+            "./" + distDir + "plugins/multimedia/libgstreamermediaplugin.so"
+        }
+        );
+
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "/translations/qtmultimedia_ka.qm",
+            "./" + distDir + "/lib/libQt6VirtualKeyboardSettings.so"
+        }
+        );
+#endif
+    return Tree;
+}
+
+QSet<QString> ModulesQt6_8::qtWebEngine(const QString &distDir) const{
+    TestUtils utils;
+
+    auto Tree = ModulesQt6_6::qtWebEngine(distDir);
+
+#ifdef Q_OS_LINUX
+
+
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "/lib/libQt6Network.so",
+            "./" + distDir + "/lib/libQt6QmlMeta.so",
+            "./" + distDir + "/lib/libQt6QmlWorkerScript.so",
+            "./" + distDir + "/translations/qtdeclarative_ka.qm",
+            "./" + distDir + "/translations/qtserialport_ka.qm",
+            "./" + distDir + "/translations/qtwebengine_ka.qm"
+        }
+        );
+#endif
+    return Tree;
+}
+
+QSet<QString> ModulesQt6_8::qtWebEngineWidgets(const QString &distDir) const{
+    TestUtils utils;
+
+    auto Tree = ModulesQt6_6::qtWebEngineWidgets(distDir);
+
+#ifdef Q_OS_LINUX
+
+
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "/lib/libQt6Network.so",
+            "./" + distDir + "/lib/libQt6QmlMeta.so",
+            "./" + distDir + "/lib/libQt6QmlWorkerScript.so",
+            "./" + distDir + "/translations/qtdeclarative_ka.qm",
+            "./" + distDir + "/translations/qtserialport_ka.qm",
+            "./" + distDir + "/translations/qtwebengine_ka.qm"
+        }
+        );
+
+#endif
+    return Tree;
+}
+
+QSet<QString> ModulesQt6_8::qtLibs(const QString &distDir) const {
+    auto Tree = ModulesQt6_6::qtLibs(distDir);
+    TestUtils utils;
+
+#ifdef Q_OS_LINUX
+
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "/translations/qtbase_ka.qm",
+            "./" + distDir + "/plugins/wayland-decoration-client/libadwaita.so",
+        }
+        );
+#endif
+
+    return Tree;
+}