Merge pull request #156 from tibirna/compile-w-qt6

Compile with qt6

Author: tibirna

.github/workflows/build.yaml

@@ -22,27 +22,39 @@ on:
 
 jobs:
   build:
-    name: Build (Linux, Ubuntu 22.04 LTS)
+    name: Build (Linux, Qt ${{ matrix.qt_major }}, Ubuntu 22.04 LTS)
     runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - qt_major: 5
+            packages: qtbase5-dev
+          - qt_major: 6
+            packages: libgl1-mesa-dev libglx-dev libqt6core5compat6-dev qt6-base-dev
     steps:
       - name: 'Install build dependencies'
+        env:
+          packages: ${{ matrix.packages }}
         run: |-
           set -e
           sudo apt-get update
           sudo apt-get install --yes --no-install-recommends \
             build-essential \
             cmake \
-            qtbase5-dev
+            ${packages}
 
       - name: 'Checkout Git branch'
         uses: actions/checkout@v2.0.0
 
       - name: 'Configure'
+        env:
+          qt_major: ${{ matrix.qt_major }}
         run: |-
           set -e
           mkdir build
           cd build
-          cmake ..
+          cmake -DQT_PACKAGE="Qt${qt_major}" ..
 
       - name: 'Build'
         run: |-

CMakeLists.txt

@@ -17,30 +17,49 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
 
-option(UseQt5 "Use Qt5?" ON)
- if (UseQt5)
-   set(QT_MIN_VERSION 5.11.0)
-   find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Gui Widgets)
-   set(QT_LIBRARIES Qt5::Widgets)
-
-   macro(qt_wrap_ui)
-     qt5_wrap_ui(${ARGN})
-   endmacro()
-   macro(qt_add_resources)
-     qt5_add_resources(${ARGN})
-   endmacro()
- else()
-   find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui)
-   include(${QT_USE_FILE})
-
-   macro(qt_wrap_ui)
-     qt4_wrap_ui(${ARGN})
-   endmacro()
-   macro(qt_add_resources)
-     qt4_add_resources(${ARGN})
-   endmacro()
- endif()
+# Select the Qt major version and its dependencies\
+set(QT_PACKAGE "Qt6" CACHE STRING "Major Qt version")
+set_property(CACHE QT_PACKAGE PROPERTY STRINGS "Qt6" "Qt5" "Qt4")
+
+find_package(QT NAMES ${QT_PACKAGE} REQUIRED)
+set(QT Qt${QT_VERSION_MAJOR})
+message(STATUS "Using ${QT}")
+
+if (QT_VERSION_MAJOR EQUAL 6)
+    set(QT_MIN_VERSION 6.2.4)
+    set(QT_MODULES Core Gui Widgets Core5Compat)
+    set(QT_LIBRARIES Qt6::Widgets Qt6::Core5Compat)
+elseif (QT_VERSION_MAJOR EQUAL 5)
+    set(QT_MIN_VERSION 5.11.0)
+    set(QT_MODULES Core Gui Widgets)
+    set(QT_LIBRARIES Qt5::Widgets)
+elseif (QT_MAJOR_VERSION EQUAL 4)
+    set(QT_MODULES QtCore QtGui)
+    include(${QT_USE_FILE})
+endif()
+
+find_package(${QT} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_MODULES})
+
+if (QT_VERSION VERSION_LESS 5.15)
+    if (QT_VERSION_MAJOR EQUAL 4)
+        macro(qt_wrap_ui)
+            qt4_wrap_ui(${ARGN})
+        endmacro()
+        macro(qt_add_resources)
+            qt4_add_resources(${ARGN})
+        endmacro()
+    elseif(QT_VERSION_MAJOR EQUAL 5)
+        macro(qt_wrap_ui)
+          qt5_wrap_ui(${ARGN})
+        endmacro()
+        macro(qt_add_resources)
+          qt5_add_resources(${ARGN})
+        endmacro()
+    endif()
+endif()
+
 
+# Sources
 include_directories(
     ${CMAKE_SOURCE_DIR}/src
 )

src/FileHistory.cc

@@ -122,7 +122,11 @@ void FileHistory::clear(bool complete) {
   rowData.clear();
 
   if (testFlag(REL_DATE_F)) {
+#if QT_VERSION >= 0x06000
+    secs = QDateTime::currentDateTime().toSecsSinceEpoch();
+#else
     secs = QDateTime::currentDateTime().toTime_t();
+#endif
 #ifdef HAVE_COLUMNTYPE
     headerInfo[ColumnType::TIME_COL] = "Last Change";
 #else