Skip to content

Commit da7d23c

Browse files
2 parents 4947548 + 64d80b2 commit da7d23c

File tree

3 files changed

+43
-20
lines changed

3 files changed

+43
-20
lines changed

.github/workflows/linux-builds.yml

Lines changed: 41 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,49 @@ name: linux-builds
22

33
on: [push]
44

5-
jobs:
6-
build:
7-
strategy:
8-
matrix:
9-
os: [ubuntu-20.04]
10-
11-
runs-on: ${{ matrix.os }}
12-
5+
jobs:
6+
build_ubuntu_2204_cmake:
7+
runs-on: ubuntu-22.04
8+
9+
env:
10+
QT_VERSION: 6.4.2
11+
QT_DIR: ${{ github.workspace }}/Qt
12+
1313
steps:
14-
- uses: actions/checkout@v1
15-
- name: install qt
14+
- name: Checkout source
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0 # Fetch full history and tags
18+
19+
- name: Install dependencies
1620
run: |
17-
sudo apt-get update --fix-missing
18-
sudo apt-get install qt5-default
19-
sudo apt-get install qtbase5-private-dev qtdeclarative5-dev
20-
- name: qmake
21-
run: qmake
22-
- name: make
23-
run: make -j4
24-
21+
sudo apt-get update
22+
sudo apt-get install -y build-essential cmake ninja-build libgl1-mesa-dev libxkbcommon-x11-0 libx11-dev
23+
24+
- name: Install Qt
25+
uses: jurplel/install-qt-action@v3
26+
with:
27+
version: ${{ env.QT_VERSION }}
28+
target: desktop
29+
host: linux
30+
arch: gcc_64
31+
dir: ${{ env.QT_DIR }}
32+
setup-python: false
33+
34+
- name: Configure with CMake
35+
run: |
36+
cmake -S . -B build \
37+
-DCMAKE_PREFIX_PATH="${{ env.QT_DIR }}/Qt/${{ env.QT_VERSION }}/gcc_64" \
38+
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install \
39+
-DCMAKE_BUILD_TYPE=Release \
40+
-G Ninja
41+
42+
- name: Build
43+
run: cmake --build build
44+
45+
- name: Run CMake install (optional)
46+
run: cmake --install build
47+
2548
build_ubuntu_2204:
2649
runs-on: ubuntu-22.04
2750
steps:

src/AutoHideDockContainer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ void CAutoHideDockContainer::cleanupAndDelete()
425425
const auto dockWidget = d->DockWidget;
426426
if (dockWidget)
427427
{
428-
429428
auto SideTab = d->SideTab;
429+
dockWidget->setSideTabWidget(nullptr);
430430
SideTab->removeFromSideBar();
431431
SideTab->setParent(nullptr);
432432
SideTab->hide();

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ install(FILES ${ads_HEADERS}
132132
install(FILES
133133
"${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE"
134134
"${CMAKE_CURRENT_SOURCE_DIR}/../gnu-lgpl-v2.1.md"
135-
DESTINATION license/ads
135+
DESTINATION share/ads/license
136136
COMPONENT license
137137
)
138138
install(TARGETS ${library_name}

0 commit comments

Comments
 (0)