Merge pull request #167 from sevketcaba/qt6

svlad-90 · web-flow · commit 61649dcd74bd · 2023-05-25T11:10:40.000+03:00
[ISSUE-166][DEPENDENCY_UPDATE] Compatibility with Qt6
diff --git a/dltmessageanalyzerplugin/src/CMakeLists.txt b/dltmessageanalyzerplugin/src/CMakeLists.txt
@@ -99,6 +99,11 @@ endif()
 
 include_directories(../../thirdparty/DMA_Plantuml/src)
 
+# to force variant lite to use nonstd::variant
+# otherwise the implementation will throw compile-time errors
+# with C++17
+add_compile_definitions(variant_CONFIG_SELECT_VARIANT=variant_VARIANT_NONSTD)
+
 DMA_add_subdirectory_with_clang_tidy(common)
 DMA_add_subdirectory_with_clang_tidy(components)
 DMA_add_subdirectory_with_clang_tidy(plugin)
@@ -130,7 +135,7 @@ add_custom_command(TARGET DLT-Message-Analyzer POST_BUILD
 ################### PLANTUML ( END ) ######################
 
 ################### QT ####################################
-target_link_libraries(DLT-Message-Analyzer qdlt Qt5::Widgets )
+target_link_libraries(DLT-Message-Analyzer qdlt ${QT_PREFIX}::Widgets )
 ################### QT ( END ) ############################
 
 add_plugin(DLT-Message-Analyzer)
diff --git a/dltmessageanalyzerplugin/src/common/CMakeLists.txt b/dltmessageanalyzerplugin/src/common/CMakeLists.txt
@@ -9,5 +9,5 @@ add_library(DMA_common STATIC
 add_subdirectory(PCRE)
 
 ################### QT ####################################
-target_link_libraries(DMA_common qdlt Qt5::Widgets )
+target_link_libraries(DMA_common qdlt ${QT_PREFIX}::Widgets )
 ################### QT ( END ) ############################
diff --git a/dltmessageanalyzerplugin/src/common/Definitions.cpp b/dltmessageanalyzerplugin/src/common/Definitions.cpp
@@ -2565,7 +2565,7 @@ bool convertLogFileToDLT( const QString& sourceFilePath, const QString& targetFi
                     data.push_back(strLength_high);
                     data.push_back(strLength_low);
 
-                    data.append(strCopy);
+                    data.append(strCopy.toUtf8());
 
                     // 2-3 bytes: LEN - at last, set the data length.
                     uint16_t storageHeaderSize = 16;
diff --git a/dltmessageanalyzerplugin/src/common/PCRE/CMakeLists.txt b/dltmessageanalyzerplugin/src/common/PCRE/CMakeLists.txt
@@ -6,7 +6,7 @@ add_library(DMA_PCRE STATIC
 DMA_SuppressClangTidy_END()
 
 ################### QT ####################################
-target_link_libraries(DMA_PCRE Qt5::Widgets )
+target_link_libraries(DMA_PCRE ${QT_PREFIX}::Widgets )
 ################### QT ( END ) ############################
 
 ################### ANTLR_LINKAGE #########################
diff --git a/dltmessageanalyzerplugin/src/components/analyzer/src/CMakeLists.txt b/dltmessageanalyzerplugin/src/components/analyzer/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-qt5_wrap_cpp(PROCESSED_MOCS
+qt_wrap_cpp(PROCESSED_MOCS
              ../api/IDLTMessageAnalyzerControllerConsumer.hpp
              ../api/IDLTMessageAnalyzerController.hpp)
 
@@ -16,7 +16,7 @@ add_library(DMA_analyzer STATIC
 
 target_link_libraries( DMA_analyzer PUBLIC
                        qdlt
-                       Qt5::Widgets
+                       ${QT_PREFIX}::Widgets
                        DMA_framework_base
                        DMA_framework_component
                        DMA_Plantuml )
diff --git a/dltmessageanalyzerplugin/src/components/filtersView/src/CFiltersView.cpp b/dltmessageanalyzerplugin/src/components/filtersView/src/CFiltersView.cpp
@@ -10,6 +10,7 @@
 #include "QClipboard"
 #include "QLineEdit"
 #include "QKeyEvent"
+#include "QActionGroup"
 
 #include "CFiltersModel.hpp"
 #include "components/settings/api/ISettingsManager.hpp"
diff --git a/dltmessageanalyzerplugin/src/components/filtersView/src/CMakeLists.txt b/dltmessageanalyzerplugin/src/components/filtersView/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-qt5_wrap_cpp(PROCESSED_MOCS
+qt_wrap_cpp(PROCESSED_MOCS
              ../api/CFiltersView.hpp
              ../api/IFiltersModel.hpp)
 
@@ -11,7 +11,7 @@ add_library(DMA_filtersView STATIC
 
 target_link_libraries( DMA_filtersView PUBLIC
                        qdlt
-                       Qt5::Widgets
+                       ${QT_PREFIX}::Widgets
                        DMA_framework_base
                        DMA_framework_component
                        DMA_Plantuml )
@@ -24,7 +24,7 @@ DMA_SuppressClangTidy_END()
 target_link_libraries( DMA_filtersView_no_clang_tidy
                        PUBLIC
                        qdlt
-                       Qt5::Widgets
+                       ${QT_PREFIX}::Widgets
                        DMA_framework_base
                        DMA_framework_component
                        DMA_Plantuml )
diff --git a/dltmessageanalyzerplugin/src/components/groupedView/src/CMakeLists.txt b/dltmessageanalyzerplugin/src/components/groupedView/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-qt5_wrap_cpp(PROCESSED_MOCS
+qt_wrap_cpp(PROCESSED_MOCS
              ../api/CGroupedView.hpp)
 
 add_library(DMA_groupedView STATIC
@@ -10,7 +10,7 @@ add_library(DMA_groupedView STATIC
 
 target_link_libraries( DMA_groupedView PUBLIC
                        qdlt
-                       Qt5::Widgets
+                       ${QT_PREFIX}::Widgets
                        DMA_framework_base
                        DMA_framework_component
                        DMA_Plantuml )
diff --git a/dltmessageanalyzerplugin/src/components/log/src/CMakeLists.txt b/dltmessageanalyzerplugin/src/components/log/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-qt5_wrap_cpp(PROCESSED_MOCS
+qt_wrap_cpp(PROCESSED_MOCS
              ../api/CConsoleView.hpp)
 
 add_library(DMA_log STATIC
@@ -11,7 +11,7 @@ add_library(DMA_log STATIC
 
 target_link_libraries( DMA_log PUBLIC
                        qdlt
-                       Qt5::Widgets
+                       ${QT_PREFIX}::Widgets
                        DMA_framework_base
                        DMA_framework_component
                        DMA_Plantuml )
diff --git a/dltmessageanalyzerplugin/src/components/logo/src/CMakeLists.txt b/dltmessageanalyzerplugin/src/components/logo/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-qt5_wrap_cpp(PROCESSED_MOCS
+qt_wrap_cpp(PROCESSED_MOCS
              ../api/CLogo.hpp)
 
 add_library(DMA_logo STATIC
@@ -8,7 +8,7 @@ add_library(DMA_logo STATIC
 
 target_link_libraries( DMA_logo PUBLIC
                        qdlt
-                       Qt5::Widgets
+                       ${QT_PREFIX}::Widgets
                        DMA_framework_base
                        DMA_framework_component
                        DMA_Plantuml )
diff --git a/dltmessageanalyzerplugin/src/components/logsWrapper/src/CMakeLists.txt b/dltmessageanalyzerplugin/src/components/logsWrapper/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-qt5_wrap_cpp(PROCESSED_MOCS
+qt_wrap_cpp(PROCESSED_MOCS
              ../api/IFileWrapper.hpp)
 
 add_library(DMA_logsWrapper STATIC
@@ -14,7 +14,7 @@ add_library(DMA_logsWrapper STATIC
 
 target_link_libraries( DMA_logsWrapper PUBLIC
                        qdlt
-                       Qt5::Widgets
+                       ${QT_PREFIX}::Widgets
                        DMA_framework_base
                        DMA_framework_component
                        DMA_Plantuml )
diff --git a/dltmessageanalyzerplugin/src/components/patternsView/src/CMakeLists.txt b/dltmessageanalyzerplugin/src/components/patternsView/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-qt5_wrap_cpp(PROCESSED_MOCS
+qt_wrap_cpp(PROCESSED_MOCS
              ../api/IPatternsModel.hpp
              ../api/CPatternsView.hpp)
 
@@ -11,7 +11,7 @@ add_library(DMA_patternsView STATIC
 
 target_link_libraries( DMA_patternsView PUBLIC
                        qdlt
-                       Qt5::Widgets
+                       ${QT_PREFIX}::Widgets
                        DMA_framework_base
                        DMA_framework_component
                        DMA_Plantuml )
diff --git a/dltmessageanalyzerplugin/src/components/patternsView/src/CPatternsModel.cpp b/dltmessageanalyzerplugin/src/components/patternsView/src/CPatternsModel.cpp
@@ -400,7 +400,7 @@ QVariant CPatternsModel::data(const QModelIndex &index, int role) const
             result = Qt::AlignLeft;
         }
     }
-    else if (role == Qt::BackgroundColorRole)
+    else if (role == Qt::BackgroundRole)
     {
         result = QColor(0,0,0,0);
     }
@@ -417,7 +417,7 @@ Qt::ItemFlags CPatternsModel::flags(const QModelIndex &index) const
         if ( index.column() == static_cast<int>(ePatternsColumn::Default) ||
              index.column() == static_cast<int>(ePatternsColumn::Combine))
         {
-            result = QAbstractItemModel::flags(index) | Qt::ItemIsTristate;
+            result = QAbstractItemModel::flags(index) | Qt::ItemIsAutoTristate;
         }
         else
         {
diff --git a/dltmessageanalyzerplugin/src/components/plant_uml/src/CMakeLists.txt b/dltmessageanalyzerplugin/src/components/plant_uml/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-qt5_wrap_cpp(PROCESSED_MOCS
+qt_wrap_cpp(PROCESSED_MOCS
              ../api/CUMLView.hpp)
 
 add_library(DMA_plant_uml STATIC
@@ -10,7 +10,7 @@ add_library(DMA_plant_uml STATIC
 
 target_link_libraries( DMA_plant_uml PUBLIC
                        qdlt
-                       Qt5::Widgets
+                       ${QT_PREFIX}::Widgets
                        DMA_framework_base
                        DMA_framework_component
                        DMA_Plantuml )
diff --git a/dltmessageanalyzerplugin/src/components/plant_uml/src/CUMLView.cpp b/dltmessageanalyzerplugin/src/components/plant_uml/src/CUMLView.cpp
@@ -15,6 +15,7 @@
 #include "QMetaEnum"
 #include "QPushButton"
 #include "QPlainTextEdit"
+#include "QActionGroup"
 
 #include "CImageViewer.hpp"
 #include "../api/CUMLView.hpp"
diff --git a/dltmessageanalyzerplugin/src/components/searchView/src/CMakeLists.txt b/dltmessageanalyzerplugin/src/components/searchView/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-qt5_wrap_cpp(PROCESSED_MOCS
+qt_wrap_cpp(PROCESSED_MOCS
              ../api/CSearchResultView.hpp
              ../api/CSearchViewComponent.hpp)
 
@@ -12,7 +12,7 @@ add_library(DMA_searchView STATIC
 
 target_link_libraries( DMA_searchView PUBLIC
                        qdlt
-                       Qt5::Widgets
+                       ${QT_PREFIX}::Widgets
                        DMA_framework_base
                        DMA_framework_component
                        DMA_Plantuml )
diff --git a/dltmessageanalyzerplugin/src/components/searchView/src/CSearchResultView.cpp b/dltmessageanalyzerplugin/src/components/searchView/src/CSearchResultView.cpp
@@ -23,6 +23,7 @@
 #include <QDialogButtonBox>
 #include <QFontDialog>
 #include <QTableWidget>
+#include <QActionGroup>
 
 #include "common/Definitions.hpp"
 #include "CSearchResultHighlightingDelegate.hpp"
diff --git a/dltmessageanalyzerplugin/src/components/settings/src/CMakeLists.txt b/dltmessageanalyzerplugin/src/components/settings/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-qt5_wrap_cpp(PROCESSED_MOCS
+qt_wrap_cpp(PROCESSED_MOCS
              ../api/ISettingsManager.hpp)
 
 add_library(DMA_settings STATIC
@@ -12,7 +12,7 @@ add_library(DMA_settings STATIC
 
 target_link_libraries( DMA_settings PUBLIC
                        qdlt
-                       Qt5::Widgets
+                       ${QT_PREFIX}::Widgets
                        DMA_framework_base
                        DMA_framework_component
                        DMA_Plantuml )
diff --git a/dltmessageanalyzerplugin/src/dltmessageanalyzerplugin.hpp b/dltmessageanalyzerplugin/src/dltmessageanalyzerplugin.hpp
@@ -15,7 +15,7 @@
 #include "common/Definitions.hpp"
 
 #define DLT_MESSAGE_ANALYZER_NAME "DLT-Message-Analyzer"
-#define DLT_MESSAGE_ANALYZER_PLUGIN_VERSION "1.0.24"
+#define DLT_MESSAGE_ANALYZER_PLUGIN_VERSION "1.0.25"
 #define DLT_MESSAGE_ANALYZER_PLUGIN_AUTHOR "Vladyslav Goncharuk <svlad1990@gmail.com>"
 
 class CDLTMessageAnalyzer;
diff --git a/dltmessageanalyzerplugin/src/plugin/src/CDLTMessageAnalyzer.cpp b/dltmessageanalyzerplugin/src/plugin/src/CDLTMessageAnalyzer.cpp
@@ -10,7 +10,6 @@
 #include <QLineEdit>
 #include <QPropertyAnimation>
 #include <QSequentialAnimationGroup>
-#include <QRegExp>
 #include <QInputDialog>
 #include <QHeaderView>
 #include "QFileDialog"
diff --git a/dltmessageanalyzerplugin/src/plugin/src/CMakeLists.txt b/dltmessageanalyzerplugin/src/plugin/src/CMakeLists.txt
@@ -1,6 +1,6 @@
-QT5_WRAP_UI( UI_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/form.ui )
+QT_WRAP_UI( UI_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/form.ui )
 
-qt5_wrap_cpp(PROCESSED_MOCS
+qt_wrap_cpp(PROCESSED_MOCS
              ../api/form.h
              ../api/CDLTMessageAnalyzer.hpp)
 
@@ -25,7 +25,7 @@ target_link_libraries( DMA_plugin PUBLIC
                       DMA_patternsView
                       DMA_PCRE
                       qdlt
-                      Qt5::Widgets 
+                      ${QT_PREFIX}::Widgets 
                       DMA_framework_base 
                       DMA_framework_component
                       DMA_Plantuml )
diff --git a/md/installation_guide/installation_guide.md b/md/installation_guide/installation_guide.md
@@ -193,7 +193,7 @@ As of now, they are Linux and Windows.
 > sudo apt-get install libqt5serialport5
 > sudo apt-get install libqt5serialport5-dev
 >```
->
+> for Qt6 [__qtserialport__](https://doc.qt.io/qt-6/qtserialport-index.html) module needs to be installed.
 
 ----
 
diff --git a/md/thirdparty_deps/thirdparty_deps.md b/md/thirdparty_deps/thirdparty_deps.md
@@ -12,6 +12,7 @@
 | dma_framework | [Repository](https://github.com/svlad-90/DMA_Framework) | Apache 2.0 | [License](https://github.com/svlad-90/DMA_Framework/blob/master/LICENSE) |
 | dma_plantuml | [Repository](https://github.com/svlad-90/DMA_Plantuml) | Apache 2.0 | [License](https://github.com/svlad-90/DMA_Plantuml/blob/master/LICENSE) |
 | qt5 | [Repository](https://github.com/qt/qt5) | (L)GPL | [License](https://github.com/qt/qt5/blob/dev/LICENSE.FDL) |
+| qt6 (optional) | [Repository](https://github.com/qt/qtbase) | (L)GPL | [License](https://github.com/qt/qtbase/blob/dev/LICENSES) |
 | qdlt | [Repository](https://github.com/GENIVI/dlt-viewer/tree/master/qdlt) | MPL 2.0 | [License](https://github.com/GENIVI/dlt-viewer/blob/master/LICENSE.txt) |
 | plantuml | [Repository](https://github.com/plantuml/plantuml) | GPL 3.0 | [License](https://github.com/plantuml/plantuml/blob/master/license.txt) |
 | antlr4 | [Repository](https://github.com/antlr/antlr4) | MIT | [License](https://github.com/antlr/antlr4/blob/master/LICENSE.txt) |
diff --git a/md/thirdparty_deps/thirdparty_deps.puml b/md/thirdparty_deps/thirdparty_deps.puml
@@ -19,6 +19,7 @@ package "DLT_Message_Analyzer Dependencies" {
 
     package "Qt" {
         [qt5]
+        [qt6]
     }
 
     package "DMA_Family" {
@@ -64,6 +65,7 @@ package "DLT_Message_Analyzer Dependencies" {
 [dlt_message_analyzer_source] --> [dma_plantuml] : https://github.com/svlad-90/DMA_Plantuml
 
 [dlt_message_analyzer_source] --> [qt5] : https://github.com/qt/qt5
+[dlt_message_analyzer_source] --> [qt6] : https://github.com/qt/qtbase
 [dlt_message_analyzer_source] --> [qdlt] : https://github.com/GENIVI/dlt-viewer/tree/master/qdlt
 [dlt_message_analyzer_source] --> [plantuml] : https://github.com/plantuml/plantuml
 [dlt_message_analyzer_source] --> [antlr4] : https://github.com/antlr/antlr4
diff --git a/md/thirdparty_deps/thirdparty_deps.svg b/md/thirdparty_deps/thirdparty_deps.svg
