Merge pull request #252 from cneben/develop

2.5.0

Author: cneben

.github/workflows/build-linux-qt5.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.4.*'
+          version: '6.6.*'
           host: 'windows'
           target: 'desktop'
           arch: 'win64_msvc2019_64'
@@ -35,7 +35,7 @@ jobs:
 
       - name: Install dependencies and generate project files
         run: |
-          cmake -S '${{ github.workspace }}/' -B '${{ github.workspace }}/Build' -DCMAKE_GENERATOR:STRING=Ninja -DCMAKE_BUILD_TYPE:STRING=Release 
+          cmake -S '${{ github.workspace }}/' -B '${{ github.workspace }}/Build' -DCMAKE_GENERATOR:STRING=Ninja -DCMAKE_BUILD_TYPE:STRING=Release -DQUICK_QANAVA_CI=ON
          
       - name: Compiling QuickQanava
         shell: cmd

.github/workflows/build-win64-qt5.yml

@@ -14,3 +14,5 @@ samples/build*
 .idea
 .DS_Store
 build-tests-*
+
+build

.github/workflows/build-win64-qt6.yml

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## 20240922 2.5.0:
+- #248: Add full support for cmake qt_add_qml_module(), QuickQanava must now be used
+  as a static QML module (qml compiler is automatically applied, it look like it is a lot faster...).
+- #244: Add scrollbar support to qan::Navigable, better graph view area support.
+- #238: Change group layout, add header support in group delegate.
+- #228: Add preliminary support for auto tree layouts.
+
+## 20240812 2.4.2:
+- Merge #230 by @emmenlau, enhance node/group factory methods template signature.
+- Merge #236 by @emmenlau, fix a memory leak.
+- Merge #233 by @emmenlau, fix a compilation issue in graph.h.
+- Change group dragging default behaviour: group are now only draggable by their
+  header. Old policy can be restored with qan::GroupItem::DragPolicy.
+
 ## 20231116 2.4.0:
 - Rewrite the Qt5/6 CMake configuration.
 - Remove all QUICKQANAVA_QT_MAJOR_VERSION and all compilation options, compilation is now always "static".

.gitignore

@@ -1,21 +1,38 @@
-cmake_minimum_required(VERSION 3.5.0)
+cmake_minimum_required(VERSION 3.16)
 
-project(QuickQanava VERSION 2.4.0 LANGUAGES CXX)
+project(QuickQanava VERSION 2.5.0 LANGUAGES CXX)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick Qml Quick QuickControls2)
+find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml Quick QuickControls2)
 
 message("Building QuickQanava for Qt${QT_VERSION_MAJOR}")
 
-option(QUICK_QANAVA_BUILD_SAMPLES "Build the samples" FALSE)
+add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00)
 
-if (${QT_VERSION_MAJOR} EQUAL 5)
-    include(CMakeLists.qt5.txt)
-else()
-    include(CMakeLists.qt6.txt)
+add_subdirectory(src)
+
+option(QUICK_QANAVA_BUILD_SAMPLES "Build QuickQanava samples" OFF)
+if (${QUICK_QANAVA_CI})
+    add_subdirectory(samples/groups)    # Used to test CI
 endif()
 
-add_subdirectory(src)
+if (${QUICK_QANAVA_BUILD_SAMPLES})
+    add_subdirectory(samples/advanced)
+    add_subdirectory(samples/connector)
+    add_subdirectory(samples/cpp)
+
+    add_subdirectory(samples/dataflow)
+    add_subdirectory(samples/edges)
+    add_subdirectory(samples/navigable)
+
+    add_subdirectory(samples/groups)
+    add_subdirectory(samples/nodes)
+    add_subdirectory(samples/layouts)
+    add_subdirectory(samples/selection)
+
+    add_subdirectory(samples/style)
+    add_subdirectory(samples/topology)
+endif()

CHANGELOG.md

@@ -1,21 +1,21 @@
 # QuickQanava 
 
-![Linux Qt5 g++ qmake](https://github.com/cneben/QuickQanava/actions/workflows/build-linux-qt5.yml/badge.svg) 
-![Win64 Qt5 msvc qmake](https://github.com/cneben/QuickQanava/actions/workflows/build-win64-qt5.yml/badge.svg) 
 ![Win64 Qt6 msvc CMake](https://github.com/cneben/QuickQanava/actions/workflows/build-win64-qt6.yml/badge.svg) 
 
 [![Documentation](https://img.shields.io/badge/docs-mkdocs-blue.svg)](http://cneben.github.io/QuickQanava/)
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
-![](https://img.shields.io/badge/version-2.1.0-blue.svg)
+![](https://img.shields.io/badge/version-2.5.0-blue.svg)
 [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/fold_left.svg?style=social&label=Follow%20%40QuickQanava)](https://twitter.com/QuickQanava)
 
 ![](https://github.com/cneben/QuickQanava/blob/master/doc/web/docs/images/home.png)
 
-`QuickQanava` is a C++14 library designed to display graphs and relational content in a Qt/QML application. QuickQanava provide QML components and C++ classes to visualize medium-sized directed graphs in a C++/QML application. QuickQanava focus on displaying relational content into a dynamic user interface with DnD support, resizable content and visual creation of topology. QuickQanava focus on writing topology delegates in pure QML.
+`QuickQanava` is a C++17 library developed for rendering graphs and relational content within a Qt/QML application. It offers QML components and C++ classes designed for visualizing medium-sized directed graphs in a C++/QML application. QuickQanava emphasizes the presentation of relational content in a dynamic user interface, featuring Drag-and-Drop support, resizable content, and visual creation of topology. `QuickQanava` focus authoring of topology delegates in pure QML.
 
 QuickQanava main repository is hosted on GitHub: http://cneben.github.io/QuickQanava/index.html
 
-QuickQanava is primarily developed for Linux with Qt 5.15 with MSVC2019 and g++9 (minimal required Qt version is **Qt 5.10**, recommended is **Qt 5.15.5**). 
+QuickQanava is primarily developed with Qt 6.6.1 with MSVC2019 and g++11 (minimal required Qt version is **Qt 6.5.0**, recommended is **Qt 6.6.1**). 
+
+If you are interested in **Qt5.15** support, last release supporting Qt5 is [2.4.0](https://github.com/cneben/QuickQanava/releases/tag/2.4.0)
 
 - [CHANGELOG.md](CHANGELOG.md)
 - Project homepage: http://cneben.github.io/QuickQanava/index.html
@@ -68,5 +68,5 @@ QuickQanava include `bezier` library distributed with MIT licence on https://git
 
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 
-Copyright (c) 2017-2022 BA
+Copyright (c) 2017-2024 BA
 

CMakeLists.qt5.txt

@@ -0,0 +1 @@
+2.5.0