Merge pull request #213 from cneben/f/#207-CMake-qt5-qt6

F/#207 c make qt5 qt6

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "samples/advanced/QuickQanava"]
+	path = samples/advanced/QuickQanava
+	url = [email protected]:cneben/QuickQanava.git

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 20231116 2.3.0:
+- Rewrite the Qt5/6 CMake configuration.
+- Remove all QUICKQANAVA_QT_MAJOR_VERSION and all compilation options, compilation is now always "static".
+- Fix bugs in multiple selection dragging.
+- Update https://github.com/oysteinmyrmo/bezier to `0.2.1`.
+- Add dragging of nodes / groups by keyboard arrow keys.
+
 ## 20230406 prev2.3.0:
 - Fix a serious bug on multiple selection dragging and snap to grid.
 - Fix a table node grouping issue when cols==1 or rows==1.

CMakeLists.qt5.txt

@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.5.0)
+
+add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00)
+
+find_package(Qt5 REQUIRED COMPONENTS Core Quick Qml Quick QuickControls2 REQUIRED)
+message("Building QuickQanava with Qt5")
+

CMakeLists.qt6.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.5.0)
+
+# Specific to Qt6
+add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00)
+
+find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml Quick QuickControls2)
+
+message("QuickQanava building with Qt6")
+

CMakeLists.txt

@@ -1,33 +1,19 @@
 cmake_minimum_required(VERSION 3.5.0)
 
-project(QuickQanava VERSION 2.3.0 LANGUAGES CXX)
+project(QuickQanava VERSION 2.4.0 LANGUAGES CXX)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Qml Quick QuickControls2 REQUIRED)
-message("Building with Qt" ${QT_VERSION_MAJOR})
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick Qml Quick QuickControls2)
 
-option(QUICK_QANAVA_BUILD_SAMPLES "Build the samples" TRUE)
-option(QUICK_QANAVA_BUILD_STATIC_QRC "Build *.qrc resources statically" TRUE)
-option(QUICK_QANAVA_WINDOWS_DEPLOY "Use windeployqt on Windows" FALSE)
+message("Building QuickQanava for Qt${QT_VERSION_MAJOR}")
 
-add_subdirectory(QuickContainers)
-add_subdirectory(src)
-
-if (${QUICK_QANAVA_BUILD_SAMPLES})
-    #add_subdirectory(samples/resizer)
-    #add_subdirectory(samples/navigable)
-    add_subdirectory(samples/nodes)
-    add_subdirectory(samples/cpp)
-    add_subdirectory(samples/edges)
-    add_subdirectory(samples/connector)
-    add_subdirectory(samples/groups)
-    add_subdirectory(samples/selection)
-    add_subdirectory(samples/style)
-    add_subdirectory(samples/dataflow)
-    add_subdirectory(samples/topology)
+if (${QT_VERSION_MAJOR} EQUAL 5)
+    include(CMakeLists.qt5.txt)
+else()
+    include(CMakeLists.qt6.txt)
 endif()
 
-add_subdirectory(exports)
+add_subdirectory(src)