Merge pull request #794 from QuasarApp/update_quasarapp_lib

Update quasarapp lib

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.

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/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.
@@ -122,5 +122,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.

src/Deploy/src/Distributions/deb.cpp

@@ -116,7 +116,7 @@ QProcessEnvironment Deb::processEnvirement() const {
 
 QList<SystemCommandData> Deb::runCmd() {
     QList<SystemCommandData> res;
-    for (const auto& inout: qAsConst(inouts)) {
+    for (const auto& inout: std::as_const(inouts)) {
         res.push_back({"dpkg-deb", QStringList{"--build", "--verbose"} << inout.input << inout.output});
     }
 
@@ -125,7 +125,7 @@ QList<SystemCommandData> Deb::runCmd() {
 
 QStringList Deb::outPutFiles() const {
     QStringList result;
-    for (const auto& inout: qAsConst(inouts)) {
+    for (const auto& inout: std::as_const(inouts)) {
         result.push_back(inout.output);
     }
     return result;

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>
 
 
 /**
@@ -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"
@@ -966,7 +967,7 @@ bool ConfigParser::setTargetsInDir(const QString &dir, bool recursive) {
     }
 
     bool result = false;
-    for (const auto &file : qAsConst(list)) {
+    for (const auto &file : std::as_const(list)) {
 
         if (file.isDir()) {
             result |= setTargetsInDir(file.absoluteFilePath(), recursive);
@@ -1024,9 +1025,11 @@ void ConfigParser::initIgnoreList()
     envUnix.addEnv(Envirement::recursiveInvairement("/lib", 3));
     envUnix.addEnv(Envirement::recursiveInvairement("/usr/lib", 3));
 
-    if (DeployCore::isSnap()) {
-        envUnix.addEnv(Envirement::recursiveInvairement(DeployCore::transportPathToSnapRoot("/lib"), 3));
-        envUnix.addEnv(Envirement::recursiveInvairement(DeployCore::transportPathToSnapRoot("/usr/lib"), 3));
+    if (QuasarAppUtils::PlatformUtils::isSnap()) {
+        envUnix.addEnv(Envirement::recursiveInvairement(
+            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()) {
-            debianQtRoot = DeployCore::snapRootFS() + debianQtRoot;
+        if (QuasarAppUtils::PlatformUtils::isSnap()) {
+            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(DeployCore::transportPathToSnapRoot("/usr/lib"), 5));
+    dirs.append(getDirsRecursive(QuasarAppUtils::PlatformUtils::transportPathToSnapRoot("/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."

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.
@@ -125,7 +125,7 @@ void DependenciesScanner::recursiveDep(LibInfo &lib, QSet<LibInfo> &res, QSet<QS
 
     libStack.insert(lib.fullPath());
 
-    for (const auto &i : qAsConst(lib._dependncies)) {
+    for (const auto &i : std::as_const(lib._dependncies)) {
 
         auto libs = getLibsFromEnvirement(i);
 

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();
@@ -609,7 +610,7 @@ QString DeployCore::getAppVersion() {
 }
 
 QString DeployCore::getAppVersionName() {
-    if (isSnap()) {
+    if (QuasarAppUtils::PlatformUtils::isSnap()) {
         return "*** Cool Core (snap) ***";
     }
     return "*** Cool Core ***";
@@ -661,9 +662,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) {
@@ -1006,40 +1008,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);
@@ -1053,7 +1021,7 @@ QFileInfo DeployCore::findItem(const QString &bin) {
     auto prefixes = QuasarAppUtils::Params::getArg("binPrefix").
             split(DeployCore::getSeparator(0), splitbehavior);
 
-    for (const QString& prefix :qAsConst(prefixes)) {
+    for (const QString& prefix :std::as_const(prefixes)) {
         QFileInfo info(prefix + "/" + bin);
 
         if (info.exists()) {

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.
@@ -18,7 +18,7 @@ ELF::ELF()
 QByteArrayList ELF::getDynamicString(ElfReader& reader) const {
     auto headers = reader.readHeaders();
 
-    for (const auto &sectionHeader : qAsConst(headers.sectionHeaders)) {
+    for (const auto &sectionHeader : std::as_const(headers.sectionHeaders)) {
         if (sectionHeader.name == ".dynstr") {
             auto arr = reader.readSection(sectionHeader.name).split(0);
             return arr;
@@ -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.

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.
@@ -174,7 +174,7 @@ void Extracter::copyExtraPlugins(const QString& package) {
                                             QuasarAppUtils::Warning);
             }
 
-            for (const auto& plugin : qAsConst(plugins)) {
+            for (const auto& plugin : std::as_const(plugins)) {
                 extractPluginLib(plugin, package);
             }
         }
@@ -198,7 +198,7 @@ void Extracter::extractPlugins() {
         _fileManager->copyFiles(plugins, targetPath + distro.getPluginsOutDir(), 1,
                                 DeployCore::debugExtensions(), &listItems);
 
-        for (const auto &item : qAsConst(listItems)) {
+        for (const auto &item : std::as_const(listItems)) {
             extractPluginLib(item, i.key());
         }
 
@@ -281,7 +281,7 @@ bool Extracter::copyTr() {
                 if (info.isDir()) {
                     QDir dir(info.absoluteFilePath());
                     auto availableQm = dir.entryInfoList({"*.qm"}, QDir::Files);
-                    for (const auto & trFile : qAsConst(availableQm)) {
+                    for (const auto & trFile : std::as_const(availableQm)) {
                         if (!_fileManager->copyFile(trFile.absoluteFilePath(),
                                                     cnf->getPackageTargetDir(i.key()) + i->getTrOutDir())) {
                             return false;
@@ -415,7 +415,7 @@ void Extracter::extractLib(const QString &file,
         allDependencies = _scaner->scan(file).getAllDep();
     }
 
-    for (const auto &line : qAsConst(allDependencies)) {
+    for (const auto &line : std::as_const(allDependencies)) {
 
         if (mask.size() && !line.getName().contains(mask, DeployCore::getCaseSensitivity())) {
             continue;
@@ -500,7 +500,7 @@ bool Extracter::extractQml() {
                     return false;
                 }
             } else {
-                for (const auto& plugin: qAsConst(plugins)) {
+                for (const auto& plugin: std::as_const(plugins)) {
                     const auto qmlFiles = QDir(plugin).entryInfoList(QDir::Files);
                     for (const auto& qmlFile: qmlFiles) {
                         toCopyQmlFiles.push_back(qmlFile.absoluteFilePath());
@@ -520,7 +520,7 @@ bool Extracter::extractQml() {
             }
 
 
-            for (const auto &item : qAsConst(listItems)) {
+            for (const auto &item : std::as_const(listItems)) {
                 extractPluginLib(item, i.key());
             }
 

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.
@@ -180,7 +180,7 @@ bool FileManager::fileActionPrivate(const QString &file, const QString &target,
     
     bool copy = !masks;
     if (masks) {
-        for (const auto &mask : qAsConst(*masks)) {
+        for (const auto &mask : std::as_const(*masks)) {
             if (info.absoluteFilePath().contains(mask, DeployCore::getCaseSensitivity())) {
                 copy = true;
                 break;
@@ -432,7 +432,7 @@ void FileManager::clear(const QString& targetDir, bool force) {
     }
 
     QMultiMap<int, QFileInfo> sortedOldData;
-    for (const auto& i : qAsConst(_deployedFiles)) {
+    for (const auto& i : std::as_const(_deployedFiles)) {
         sortedOldData.insert(i.size(), QFileInfo(i));
     }
 

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.
@@ -9,7 +9,7 @@
 #include <quasarapp.h>
 
 bool IgnoreRule::checkOnlytext(const QString &lib) {
-    for (const auto &ignore : qAsConst(_data)) {
+    for (const auto &ignore : std::as_const(_data)) {
         if (lib.contains(ignore.label)) {
             return true;
         }

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.
@@ -83,7 +83,7 @@ bool Packing::create() {
         return false;
     }
 
-    for (auto package : qAsConst(_pakages)) {
+    for (auto package : std::as_const(_pakages)) {
 
         if (!package) {
             internalError();
@@ -207,7 +207,7 @@ bool Packing::extractTemplates() {
         return false;
     }
 
-    for (auto package : qAsConst(_pakages)) {
+    for (auto package : std::as_const(_pakages)) {
 
         if (!package)
             return false;

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.
@@ -163,7 +163,7 @@ void PluginsParser::addPlugins(const QStringList& list, const QString& package,
                                QHash<QString, QSet<QString>>& container) {
     const DeployConfig* cnf = DeployCore::_config;
 
-    for (const auto &plugin: qAsConst(list)) {
+    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);
 

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.
@@ -79,7 +79,7 @@ bool QMLQt5::extractImportsFromDir(const QString &path, bool recursive) {
 
     for (const auto &info: files) {
         auto imports = extractImportsFromFile(info.absoluteFilePath());
-        for (const auto &import : qAsConst(imports)) {
+        for (const auto &import : std::as_const(imports)) {
             if (!_imports.contains(import)) {
                 _imports.insert(import);
                 extractImportsFromDir(getPathFromImport(import), recursive);
@@ -87,10 +87,10 @@ bool QMLQt5::extractImportsFromDir(const QString &path, bool recursive) {
         }
     }
 
-    for (const auto& module: qAsConst(qmlmodule)) {
+    for (const auto& module: std::as_const(qmlmodule)) {
         QStringList imports = extractImportsFromQmlModule(module.absoluteFilePath());
 
-        for (const auto &import : qAsConst(imports)) {
+        for (const auto &import : std::as_const(imports)) {
             if (!_imports.contains(import)) {
                 _imports.insert(import);
                 extractImportsFromDir(getPathFromImport(import), recursive);
@@ -155,7 +155,7 @@ bool QMLQt5::deployPath(const QString &path, QStringList &res) {
     QDir dir(path);
     auto infoList = dir.entryInfoList(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs);
 
-    for (const auto &info : qAsConst(infoList)) {
+    for (const auto &info : std::as_const(infoList)) {
         if (DeployCore::isDebugFile(info.fileName())) {
             QuasarAppUtils::Params::log("Skip debug library " +
                                         info.absoluteFilePath());
@@ -222,7 +222,7 @@ bool QMLQt5::scan(QStringList &res, const QString& _qmlProjectDir) {
         return false;
     }
 
-    for (const auto &import : qAsConst(_imports)) {
+    for (const auto &import : std::as_const(_imports)) {
         res.push_back(getPathFromImport(import));
     }
 

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.
@@ -69,7 +69,7 @@ bool QMLQt6::extractImportsFromDir(const QString &path, bool recursive) {
 
     for (const auto &info: files) {
         auto imports = extractImportsFromFile(info.absoluteFilePath());
-        for (const auto &import : qAsConst(imports)) {
+        for (const auto &import : std::as_const(imports)) {
             if (!_imports.contains(import)) {
                 _imports.insert(import);
                 extractImportsFromDir(getPathFromImport(import), false);
@@ -77,11 +77,11 @@ bool QMLQt6::extractImportsFromDir(const QString &path, bool recursive) {
         }
     }
 
-    for (const auto& module: qAsConst(qmlmodule)) {
+    for (const auto& module: std::as_const(qmlmodule)) {
         QStringList imports = extractImportsFromQmlModule(module.absoluteFilePath());
         imports += extractImportsFromFile(module.absoluteFilePath());
 
-        for (const auto &import : qAsConst(imports)) {
+        for (const auto &import : std::as_const(imports)) {
             if (!_imports.contains(import)) {
                 _imports.insert(import);
                 extractImportsFromDir(getPathFromImport(import), false);
@@ -153,7 +153,7 @@ bool QMLQt6::deployPath(const QString &path, QStringList &res) {
     QDir dir(path);
     auto infoList = dir.entryInfoList(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs);
 
-    for (const auto &info : qAsConst(infoList)) {
+    for (const auto &info : std::as_const(infoList)) {
         if (DeployCore::isDebugFile(info.fileName())) {
             QuasarAppUtils::Params::log("Skip debug library " +
                                         info.absoluteFilePath());
@@ -218,7 +218,7 @@ bool QMLQt6::scan(QStringList &res, const QString& _qmlProjectDir) {
         return false;
     }
 
-    for (const auto &import : qAsConst(_imports)) {
+    for (const auto &import : std::as_const(_imports)) {
         res.push_back(getPathFromImport(import));
     }
 

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 a23bbe92689b472c69b73d0e49646de991a0390f
+Subproject commit b7b0f330c6866cbc01eb663a5dc6de863815cb58

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.

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.

testcases/quicknanobrowser/main.cpp

@@ -60,7 +60,7 @@ static QUrl startupUrl()
     QUrl ret;
     QStringList args(qApp->arguments());
     args.takeFirst();
-    for (const QString &arg : qAsConst(args)) {
+    for (const QString &arg : std::as_const(args)) {
         if (arg.startsWith(QLatin1Char('-')))
              continue;
         ret = Utils::fromUserInput(arg);

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.

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.

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.

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

@@ -0,0 +1,92 @@
+/*
+ * 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_6.h"
+
+ModulesQt6_6::ModulesQt6_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;
+}
+
+QSet<QString> ModulesQt6_6::qmlVirtualKeyBoadrLibs(const QString &distDir) const {
+
+    TestUtils utils;
+
+    auto Tree = ModulesQt6_5::qmlVirtualKeyBoadrLibs(distDir);
+    return Tree;
+}
+
+QSet<QString> ModulesQt6_6::qtWebEngine(const QString &distDir) const
+{
+    TestUtils utils;
+
+    auto Tree = ModulesQt6_5::qtWebEngine(distDir);
+
+#ifdef Q_OS_WIN
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "/resources/v8_context_snapshot.bin"
+
+        }
+        );
+#else
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "/resources/v8_context_snapshot.bin",
+            "./" + distDir + "/lib/libQt6WebChannelQuick.so",
+            "./" + distDir + "/qml/QtWebChannel/libwebchannelplugin.so",
+            "./" + distDir + "/qml/QtWebChannel/libwebchannelquickplugin.so",
+
+        }
+        );
+#endif
+
+    return Tree;
+}
+
+QSet<QString> ModulesQt6_6::qtLibs(const QString &distDir) const {
+    auto Tree = ModulesQt6_5::qtLibs(distDir);
+    TestUtils utils;
+
+
+    return Tree;
+}
+
+QSet<QString> ModulesQt6_6::qtWebEngineWidgets(const QString &distDir) const
+{
+    TestUtils utils;
+
+    auto Tree = ModulesQt6_5::qtWebEngineWidgets(distDir);
+#ifdef Q_OS_WIN
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "/resources/v8_context_snapshot.bin"
+
+        }
+        );
+#else
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "/resources/v8_context_snapshot.bin"
+        }
+        );
+#endif
+    return Tree;
+}

tests/modules/modulesqt6_6.h

@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+#ifndef MODULESQT6_6_H
+#define MODULESQT6_6_H
+
+#include "modulesqt6_5.h"
+
+class ModulesQt6_6: public ModulesQt6_5
+{
+public:
+    ModulesQt6_6();
+    QSet<QString> qmlLibs(const QString &distDir = DISTRO_DIR) const override;
+    QSet<QString> qmlVirtualKeyBoadrLibs(const QString &distDir = DISTRO_DIR) const override;
+    QSet<QString> qtWebEngine(const QString &distDir = DISTRO_DIR) const override;
+    QSet<QString> qtWebEngineWidgets(const QString &distDir = DISTRO_DIR) const override;
+    QSet<QString> qtLibs(const QString &distDir = DISTRO_DIR) const override;
+};
+
+#endif // MODULESQT6_5_H

tests/tstMain.cpp

@@ -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.
@@ -78,7 +78,7 @@
 // Check exampletests
 #define TestCase(name, testClass) \
     void name() { \
-        initTest(new testClass()); \
+        initTest(new testClass); \
     }
 
 /**
@@ -159,8 +159,8 @@ private slots:
         TestCase(ziparrchivetest, ZIPArchiveTest )
         TestCase(zipmultitest, ZIPMultiTest )
         TestCase(ziptest, ZIPTest )
-        TestCase(systemLibTest, SystemLibTest)
         TestCase(qmlfiledialogtest, QmlFileDialogTest)
+        TestCase(systemLibTest, SystemLibTest)
 
 
 #endif
@@ -314,11 +314,12 @@ void tstMain::initTest(Test *test) {
             delete e;
         }
 
-        delete test;
         _app->exit(0);
     });
 
     _app->exec();
+
+    delete test;
 }
 
 QTEST_APPLESS_MAIN(tstMain)

tests/units/linux/QIFWtest.cpp

@@ -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.

tests/units/linux/QIFWtest.h

@@ -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.

tests/units/linux/QIFWtestcustom.cpp

@@ -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.

tests/units/linux/QIFWtestcustom.h

@@ -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.

tests/units/linux/QIFWtestmulti.cpp

@@ -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.

tests/units/linux/QIFWtestmulti.h

@@ -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.