From 4e90a38c5250d9aff7fc38817af0c4a1f5c745c3 Mon Sep 17 00:00:00 2001 From: Pier-Yves Lessard Date: Thu, 8 May 2025 15:18:11 -0400 Subject: [PATCH 1/6] Remove dangling pointer to tab widget when a dock widget is removed from autohide side bar (#740) --- src/AutoHideDockContainer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AutoHideDockContainer.cpp b/src/AutoHideDockContainer.cpp index 75c1409..9f13ee0 100644 --- a/src/AutoHideDockContainer.cpp +++ b/src/AutoHideDockContainer.cpp @@ -425,8 +425,8 @@ void CAutoHideDockContainer::cleanupAndDelete() const auto dockWidget = d->DockWidget; if (dockWidget) { - auto SideTab = d->SideTab; + dockWidget->setSideTabWidget(nullptr); SideTab->removeFromSideBar(); SideTab->setParent(nullptr); SideTab->hide(); From a7ad4386e450be29484a22b6d9459d9f81ff6ac7 Mon Sep 17 00:00:00 2001 From: githubuser0xFFFF Date: Thu, 8 May 2025 21:37:14 +0200 Subject: [PATCH 2/6] Update linux-builds.yml --- .github/workflows/linux-builds.yml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index c5accb1..976da65 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -2,26 +2,7 @@ name: linux-builds on: [push] -jobs: - build: - strategy: - matrix: - os: [ubuntu-20.04] - - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v1 - - name: install qt - run: | - sudo apt-get update --fix-missing - sudo apt-get install qt5-default - sudo apt-get install qtbase5-private-dev qtdeclarative5-dev - - name: qmake - run: qmake - - name: make - run: make -j4 - +jobs: build_ubuntu_2204: runs-on: ubuntu-22.04 steps: From d53728c0a8cebae120ed0fc456c1972125e92556 Mon Sep 17 00:00:00 2001 From: githubuser0xFFFF Date: Thu, 8 May 2025 21:45:55 +0200 Subject: [PATCH 3/6] Update linux-builds.yml --- .github/workflows/linux-builds.yml | 41 +++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index 976da65..1be3c34 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -2,7 +2,46 @@ name: linux-builds on: [push] -jobs: +jobs: + build_ubuntu_2204_cmake: + runs-on: ubuntu-22.04 + + env: + QT_VERSION: 6.4.2 + QT_DIR: ${{ github.workspace }}/Qt + + steps: + - name: Checkout source + uses: actions/checkout@v4 + + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y build-essential cmake ninja-build libgl1-mesa-dev libxkbcommon-x11-0 libx11-dev + + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + version: ${{ env.QT_VERSION }} + target: desktop + host: linux + arch: gcc_64 + dir: ${{ env.QT_DIR }} + setup-python: false + + - name: Configure with CMake + run: | + cmake -S . -B build \ + -DCMAKE_PREFIX_PATH="${{ env.QT_DIR }}/Qt/${{ env.QT_VERSION }}/gcc_64" \ + -DCMAKE_BUILD_TYPE=Release \ + -G Ninja + + - name: Build + run: cmake --build build + + - name: Run CMake install (optional) + run: cmake --install build + build_ubuntu_2204: runs-on: ubuntu-22.04 steps: From c1b60959ae00684dc33cae9d4ee790af2aecdd16 Mon Sep 17 00:00:00 2001 From: githubuser0xFFFF Date: Thu, 8 May 2025 21:59:12 +0200 Subject: [PATCH 4/6] Update linux-builds.yml --- .github/workflows/linux-builds.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index 1be3c34..70d8c23 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -13,6 +13,8 @@ jobs: steps: - name: Checkout source uses: actions/checkout@v4 + with: + fetch-depth: 0 # Fetch full history and tags - name: Install dependencies run: | From f2a029a0c68e3e63417e9d107c96f650b1600f2f Mon Sep 17 00:00:00 2001 From: githubuser0xFFFF Date: Thu, 8 May 2025 22:03:21 +0200 Subject: [PATCH 5/6] Update linux-builds.yml --- .github/workflows/linux-builds.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index 70d8c23..297656b 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -33,10 +33,11 @@ jobs: - name: Configure with CMake run: | - cmake -S . -B build \ - -DCMAKE_PREFIX_PATH="${{ env.QT_DIR }}/Qt/${{ env.QT_VERSION }}/gcc_64" \ - -DCMAKE_BUILD_TYPE=Release \ - -G Ninja + cmake -S . -B build \ + -DCMAKE_PREFIX_PATH="${{ env.QT_DIR }}/Qt/${{ env.QT_VERSION }}/gcc_64" \ + -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install \ + -DCMAKE_BUILD_TYPE=Release \ + -G Ninja - name: Build run: cmake --build build From 64d80b2c533e8deb262ca6063e90c472198e1c29 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Fri, 30 May 2025 14:19:14 -0400 Subject: [PATCH 6/6] LIC: Move installation of license file to share/ads folder (#748) Signed-off-by: Michael A. Jackson --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 44b5a06..97d01c6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -132,7 +132,7 @@ install(FILES ${ads_HEADERS} install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE" "${CMAKE_CURRENT_SOURCE_DIR}/../gnu-lgpl-v2.1.md" - DESTINATION license/ads + DESTINATION share/ads/license COMPONENT license ) install(TARGETS ${library_name}