solve conflicts

Author: g-abilio

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,63 @@
+name: Bug report
+description: Report crashes or incorrect behaviour of existing functionality in QtNodes.
+body:
+  - type: textarea
+    id: steps
+    attributes:
+      label: Description with steps to reproduce
+      description: Please also describe the actual (current) and expected behaviour and include a code snippet where relevant
+      placeholder: |
+        1. go to ...
+        2. then click on ...
+        3. then ...
+        Actual behaviour:
+        Expected behaviour:
+    validations:
+      required: true
+  - type: textarea
+    id: evidence
+    attributes:
+      label: Supporting files, videos and screenshots
+      description: |
+        * A short screen recording (ideally 20sec or less) or screenshot
+      placeholder: |
+        Click into this text box and paste your files, videos and screenshots here.
+    validations:
+      required: true
+  - type: input
+    id: qt_version
+    attributes:
+      label: Qt Version
+      description: What version of Qt does this bug occur on?
+      placeholder: Qt 5/6?
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: Operating system
+      description: What OS does this bug occur on?
+      placeholder: Windows 11, macOS 13, Ubuntu 22.04, etc.
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Further information which may be relevant to this bug
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Checklist
+      description: "Before submitting your bug report, please make sure the following requirements are met:"
+      options:
+        - label: "I have verified that this issue has not been logged before, by searching the [issue tracker](https://github.com/paceholder/nodeeditor/issues) for similar issues"
+          required: true
+        - label: "I have attached all requested files and information to this report"
+          required: true
+        - label: "I have attempted to identify the root problem as concisely as possible, and have used minimal reproducible examples where possible"
+          required: true
+  - type: markdown
+    attributes:
+      value: If an issue does not meet these requirements, it may be closed without investigation.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,43 @@
+name: Feature request
+description: Request new functionality or enhancements.
+body:
+  - type: textarea
+    id: idea
+    attributes:
+      label: Your idea
+      description: Describe your idea in a few sentences.
+    validations:
+      required: true
+  - type: textarea
+    id: whatfor
+    attributes:
+      label: Problem to be solved
+      description: What problem would your idea solve?
+    validations:
+      required: true
+  - type: textarea
+    id: other
+    attributes:
+      label: Prior art
+      description: Have you run into this problem with other apps? How did they solve it? You can paste screenshots.
+    validations:
+      required: false
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Anything else of note
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Checklist
+      description: "Before submitting your bug report, please make sure the following requirements are met:"
+      options:
+        - label: "I have verified that this feature request has not been logged before, by searching the [issue tracker](https://github.com/paceholder/nodeeditor/issues) for similar requests"
+          required: true
+  - type: markdown
+    attributes:
+      value: If a feature request does not meet these requirements, it may be closed without investigation.

.github/pull_request_template.md

@@ -0,0 +1,25 @@
+## Type of change
+- [ ] Bug fix
+- [ ] New feature  
+- [ ] Breaking change
+- [ ] Documentation/refactoring
+
+## Description
+<!--
+Brief description of the change;
+If this is a breaking change, please describe what breaks and how to migrate
+-->
+
+## Testing
+- Qt version tested: 
+- [ ] Existing tests still pass
+- [ ] Added tests for new functionality (if applicable)
+
+## Breaking changes?
+<!-- If yes, describe what breaks and how to migrate -->
+
+## Related issue
+<!-- Link with "Fixes #123" or "Closes #123" if applicable -->
+
+---
+*Please fill out the sections above to help reviewers understand your changes.*

.github/workflows/cmake_build.yml

@@ -69,7 +69,9 @@ jobs:
 
     - name: Setup (Linux)
       if: startsWith (matrix.os, 'ubuntu')
-      run: sudo apt-get install libxkbcommon-dev
+      run: |
+        sudo apt-get update
+        sudo apt-get install libxkbcommon-dev xvfb
 
     - name: Setup VS tools (Windows)
       if: startsWith (matrix.os, 'windows')
@@ -82,3 +84,21 @@ jobs:
 
     - name: Build with ${{ matrix.compiler }}
       run: cmake --build build --config ${{ matrix.configuration }}
+
+    - name: Run Tests (Linux)
+      if: startsWith (matrix.os, 'ubuntu')
+      run: |
+        cd build
+        xvfb-run -a ctest --output-on-failure --progress
+
+    - name: Run Tests (macOS)
+      if: startsWith (matrix.os, 'macos')
+      run: |
+        cd build
+        ctest --output-on-failure --progress
+
+    - name: Run Tests (Windows)
+      if: startsWith (matrix.os, 'windows')
+      run: |
+        cd build
+        ctest -C ${{ matrix.configuration }} --output-on-failure --progress

.gitignore

@@ -4,4 +4,6 @@ CMakeLists.txt.user
 build*/
 .vscode/
 
+qt-build
+
 tags

.readthedocs.yml

@@ -5,6 +5,11 @@
 # Required
 version: 2
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
     builder: html
@@ -13,7 +18,6 @@ sphinx:
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-    version: 3.7
     install:
         - requirements: docs/requirements.txt
 

.travis.yml

@@ -13,6 +13,10 @@ set(CMAKE_DISABLE_SOURCE_CHANGES  ON)
 set(OpenGL_GL_PREFERENCE LEGACY)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+# Enable AUTOMOC globally for all targets (needed for examples with Q_OBJECT)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
 get_directory_property(_has_parent PARENT_DIRECTORY)
 if(_has_parent)
   set(is_root_project OFF)
@@ -30,8 +34,6 @@ option(BUILD_DEBUG_POSTFIX_D "Append d suffix to debug libraries" OFF)
 option(QT_NODES_FORCE_TEST_COLOR "Force colorized unit test output" OFF)
 option(USE_QT6 "Build with Qt6 (Enabled by default)" ON)
 
-enable_testing()
-
 if(QT_NODES_DEVELOPER_DEFAULTS)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
@@ -60,16 +62,6 @@ if (${QT_VERSION} VERSION_LESS 5.11.0)
   message(FATAL_ERROR "Requires qt version >= 5.11.0, Your current version is ${QT_VERSION}")
 endif()
 
-if (${QT_VERSION_MAJOR} EQUAL 6)
-  qt_add_resources(RESOURCES ./resources/resources.qrc)
-else()
-  qt5_add_resources(RESOURCES ./resources/resources.qrc)
-endif()
-
-# Unfortunately, as we have a split include/src, AUTOMOC doesn't work.
-# We'll have to manually specify some files
-set(CMAKE_AUTOMOC ON)
-
 set(CPP_SOURCE_FILES
   src/AbstractGraphModel.cpp
   src/AbstractNodeGeometry.cpp
@@ -95,6 +87,7 @@ set(CPP_SOURCE_FILES
   src/StyleCollection.cpp
   src/UndoCommands.cpp
   src/locateNode.cpp
+  resources/resources.qrc
 )
 
 set(HPP_HEADER_FILES
@@ -141,7 +134,6 @@ set(HPP_HEADER_FILES
 add_library(QtNodes
   ${CPP_SOURCE_FILES}
   ${HPP_HEADER_FILES}
-  ${RESOURCES}
 )
 
 add_library(QtNodes::QtNodes ALIAS QtNodes)
@@ -201,28 +193,6 @@ set_target_properties(QtNodes
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
 )
 
-######
-# Moc
-##
-
-file(GLOB_RECURSE HEADERS_TO_MOC include/QtNodes/internal/*.hpp)
-
-if (${QT_VERSION_MAJOR} EQUAL 6)
-  qt_wrap_cpp(nodes_moc
-      ${HEADERS_TO_MOC}
-      TARGET QtNodes
-    OPTIONS --no-notes # Don't display a note for the headers which don't produce a moc_*.cpp
-  )
-else()
-  qt5_wrap_cpp(nodes_moc
-  ${HEADERS_TO_MOC}
-  TARGET QtNodes
-  OPTIONS --no-notes # Don't display a note for the headers which don't produce a moc_*.cpp
-  )
-endif()
-
-target_sources(QtNodes PRIVATE ${nodes_moc})
-
 ###########
 # Examples
 ##
@@ -238,9 +208,11 @@ endif()
 ##################
 # Automated Tests
 ##
+enable_testing()
+
 
 if(BUILD_TESTING)
-  #add_subdirectory(test)
+  add_subdirectory(test)
 endif()
 
 ###############