diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index c5accb1..297656b 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -2,26 +2,49 @@ name: linux-builds on: [push] -jobs: - build: - strategy: - matrix: - os: [ubuntu-20.04] +jobs: + build_ubuntu_2204_cmake: + runs-on: ubuntu-22.04 + + env: + QT_VERSION: 6.4.2 + QT_DIR: ${{ github.workspace }}/Qt - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v1 - - name: install qt + - name: Checkout source + uses: actions/checkout@v4 + with: + fetch-depth: 0 # Fetch full history and tags + + - name: Install dependencies 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 - + 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_INSTALL_PREFIX=${{ github.workspace }}/install \ + -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: 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(); 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}