fix build for qt6

.gitignore

@@ -97,3 +97,6 @@ src/CQtDeployer/Deploy/QIFW/
 src/CQtDeployer/Deploy/CQtDeployerSingle.json
 src/CQtDeployer/Deploy/QIFWTemplate/config/config.xml
 snap/snapcraft.yaml
+
+# binaries 
+testcases/bin/

CMakeLists.txt

@@ -67,6 +67,10 @@ if (DEFINED CQT_DEPLOYER_TOOL)
 endif()
 
 if (CQT_DEPLOYER_TESTS)
+
+
+    add_subdirectory(testcases)
+
     add_subdirectory(tests)
 else()
     message("The ${PROJECT_NAME} tests is disabled.")

src/LibDeploy/src/configparser.cpp

@@ -546,7 +546,7 @@ bool ConfigParser::initDistroStruct() {
         return false;
     }
 
-    if (trData.size() && !parsePackagesPrivate(mainDistro, trData, &DistroModule::addTr)) {
+    if (trData.size() && !parsePackagesPrivate(mainDistro, trData, &DistroModule::addTranslation)) {
         packagesErrorLog("tr");
         return false;
     }

src/LibDeploy/src/distromodule.cpp

@@ -175,15 +175,15 @@ void DistroModule::setInstallDirDEB(const QString &newInstallDir) {
     _installDirDEB = newInstallDir;
 }
 
-QSet<QString> DistroModule::tr() const {
+QSet<QString> DistroModule::translation() const {
     return _tr;
 }
 
-void DistroModule::setTr(const QSet<QString> &tr) {
+void DistroModule::setTranslation(const QSet<QString> &tr) {
     _tr = tr;
 }
 
-void DistroModule::addTr(const QString &tr) {
+void DistroModule::addTranslation(const QString &tr) {
     _tr += tr;
 }
 

src/LibDeploy/src/distromodule.h

@@ -70,9 +70,9 @@ public:
     void setExtraData(const QSet<QString> &extraFiles);
     void addExtraData(const QString &extraFile);
 
-    QSet<QString> tr() const;
-    void setTr(const QSet<QString> &tr);
-    void addTr(const QString &tr);
+    QSet<QString> translation() const;
+    void setTranslation(const QSet<QString> &tr);
+    void addTranslation(const QString &tr);
 
     QString installDirDEB() const;
     void setInstallDirDEB(const QString &newInstallDir);

src/LibDeploy/src/extracter.cpp

@@ -266,7 +266,7 @@ bool Extracter::copyTr() {
                                             QuasarAppUtils::Warning);
             }
 
-            const auto trFiles =  i->tr();
+            const auto trFiles =  i->translation();
             for (const auto &tr: trFiles) {
 
                 QFileInfo info(tr);

testcases/CMakeLists.txt

@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2020-2022 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.
+#
+
+cmake_minimum_required(VERSION 3.16)
+
+set(CMAKE_AUTOMOC ON)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
+
+add_subdirectory(quicknanobrowser)
+add_subdirectory(TestCPPOnly)
+add_subdirectory(TestOnlyC)
+add_subdirectory(TestQMLWidgets)
+add_subdirectory(TestQtWidgets)
+add_subdirectory(virtualkeyboard)
+add_subdirectory(webui)

testcases/TestOnlyC/main.cpp

@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main()
+{
+    printf("TEST DONE (ONLY_C)");
+    return 0;
+}

testcases/TestQMLWidgets/CMakeLists.txt

@@ -7,10 +7,12 @@
 
 cmake_minimum_required(VERSION 3.18)
 
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Quick)
+set(CMAKE_AUTOMOC ON)
 
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Qml Quick)
 set(CURRENT_PROJECT "TestQMLWidgets")
 
+
 file(GLOB_RECURSE SOURCE_CPP
     "*.cpp" "*.h"
 )
@@ -24,5 +26,11 @@ set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_executable(${CURRENT_PROJECT} ${ALL_SOURCES} )
 
-target_link_libraries(${CURRENT_PROJECT} PUBLIC Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Quick)
+target_link_libraries(${CURRENT_PROJECT} PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Qml
+    Qt::Quick
+)
+
 target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})

testcases/quicknanobrowser/CMakeLists.txt

@@ -1,5 +1,4 @@
 cmake_minimum_required(VERSION 3.16)
-project(quicknanobrowser LANGUAGES CXX)
 
 set(CMAKE_AUTOMOC ON)
 

tests/CMakeLists.txt

@@ -21,7 +21,7 @@ set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/units")
 get_filename_component(QT_QT_ROOT "${Qt${QT_VERSION_MAJOR}Core_DIR}/../../.." ABSOLUTE)
 
 add_definitions(-DQT_BASE_DIR="${QT_QT_ROOT}")
-add_definitions(-DTEST_BIN_DIR="${CMAKE_CURRENT_LIST_DIR}")
+add_definitions(-DTEST_BIN_DIR="${CMAKE_CURRENT_LIST_DIR}/testcases/bin/")
 
 add_executable(${CURRENT_PROJECT} ${SOURCE_CPP})
 target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test LibDeploy)
@@ -32,10 +32,3 @@ target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
 initTests()
 addTests(${PROJECT_NAME} ${CURRENT_PROJECT})
 
-add_subdirectory(examples/quicknanobrowser)
-add_subdirectory(examples/TestCPPOnly)
-add_subdirectory(examples/TestOnlyC)
-add_subdirectory(examples/TestQMLWidgets)
-add_subdirectory(examples/TestQtWidgets)
-add_subdirectory(examples/virtualkeyboard)
-add_subdirectory(examples/webui)

tests/examples/TestOnlyC/main.cpp

@@ -1,9 +0,0 @@
-#include <iostream>
-
-using namespace std;
-
-int main()
-{
-    cout << "TEST DONE (ONLY_C)" << endl;
-    return 0;
-}

tests/examples/TestQtWidgets/conf.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/qt/etc">
-        <file>qt.conf</file>
-    </qresource>
-</RCC>

tests/examples/TestQtWidgets/qt.conf

@@ -1,2 +0,0 @@
-[Paths]
-Prefix = /some/path