From cae42939c8415143ca1567dd2ce12615721c2517 Mon Sep 17 00:00:00 2001 From: Uwe Kindler Date: Fri, 10 Feb 2023 11:36:40 +0100 Subject: [PATCH 1/8] Disable native windows on Linux if wayland is used --- src/FloatingDockContainer.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/FloatingDockContainer.cpp b/src/FloatingDockContainer.cpp index 9e9168c..bd1e291 100644 --- a/src/FloatingDockContainer.cpp +++ b/src/FloatingDockContainer.cpp @@ -674,6 +674,17 @@ CFloatingDockContainer::CFloatingDockContainer(CDockManager *DockManager) : native_window = window_manager != "KWIN"; } + if (native_window) + { + // Native windows do not work if wayland is used. Ubuntu 22.04 uses wayland by default. To use + // native windows, switch to Xorg + QString XdgSessionType = qgetenv("XDG_SESSION_TYPE").toLower(); + if ("wayland" == XdgSessionType) + { + native_window = false; + } + } + if (native_window) { setTitleBarWidget(new QWidget()); From fab41828ab309d004968bfee45abd553142708f0 Mon Sep 17 00:00:00 2001 From: Uwe Kindler Date: Fri, 10 Feb 2023 12:02:42 +0100 Subject: [PATCH 2/8] Updated the build documentation for Ubuntu 22.04 --- README.md | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ca2a805..ae4aaa6 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,9 @@ know it from Visual Studio. - [macOS](#macos) - [Linux](#linux) - [Build](#build) + - [Qt5 on Ubuntu 18.04 or 20.04](#qt5-on-ubuntu-1804-or-2004) + - [Qt5 on Ubuntu 22.04](#qt5-on-ubuntu-2204) + - [Qt6 on Ubuntu 22.04](#qt6-on-ubuntu-2204) - [Getting started / Example](#getting-started--example) - [License information](#license-information) - [Donation](#donation) @@ -292,10 +295,13 @@ The application can be compiled for macOS. A user reported, that the library wor [![Build Status](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System.svg?branch=master)](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System) [![Build status](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/workflows/linux-builds/badge.svg)](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/actions?query=workflow%3Alinux-builds) -Unfortunately, there is no such thing as a Linux operating system. Linux is a heterogeneous environment with a variety of different distributions. So it is not possible to support "Linux" like this is possible for Windows. It is only possible to support and test a small subset of Linux distributions. The library can be compiled for and has been developed and tested with the following Linux distributions: +Unfortunately, there is no such thing as a Linux operating system. Linux is a heterogeneous environment with a variety of different distributions. So it is not possible to support "Linux" like this is possible for Windows. It is only possible to support and test a small subset of Linux distributions. The library can be compiled for and has been developed and tested with the some Linux distributions. Depending on the used window manager or compositor, dock widgets +with native title bars are supported or not. If native title bars are not supported, +the library switches to `QWidget` based title bars. -- **Kubuntu 18.04 and 19.10** -- **Ubuntu 18.04, 19.10 and 20.04** +- **Kubuntu 18.04 and 19.10** - uses KWin - no native title bars +- **Ubuntu 18.04, 19.10 and 20.04** - native title bars are supported +- **Ubuntu 22.04** - uses Wayland -> no native title bars There are some requirements for the Linux distribution that have to be met: @@ -310,10 +316,25 @@ Screenshot Ubuntu: ## Build -The Linux build requires private header files. Make sure that they are installed: +The Linux build requires private header files. Make sure that they are installed. +The library uses SVG icons, so ensure that Qt SVG support is installed. + +### Qt5 on Ubuntu 18.04 or 20.04 ```bash -sudo apt install qtbase5-private-dev +sudo apt install qt5-default qtbase5-private-dev +``` + +### Qt5 on Ubuntu 22.04 + +```bash +sudo apt install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools libqt5svg5 +``` + +### Qt6 on Ubuntu 22.04 + +```bash +sudo apt install qt6-base-dev qt6-base-private-dev qt6-tools-dev libqt6svg6 ``` Open the `ads.pro` file with QtCreator and start the build, that's it. From 009af32e61dc66eef296b28c37971be1ec8c14a9 Mon Sep 17 00:00:00 2001 From: githubuser0xFFFF Date: Fri, 10 Feb 2023 13:25:58 +0100 Subject: [PATCH 3/8] Update linux-builds.yml added Ubuntu 22.04 build with Qt6 --- .github/workflows/linux-builds.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index 9a80bd9..339fe75 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -21,3 +21,19 @@ jobs: run: qmake - name: make run: make -j4 + + build_ubuntu_2204: + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v1 + - name: install qt + run: | + sudo apt-get update --fix-missing + sudo apt-get install qt6-base-dev + sudo apt-get install qt6-base-private-dev + sudo apt-get install libqt6svg6 + - name: qmake + run: qmake + - name: make + run: make -j4 From a4c6f1d16cccd01ff09c6e2fb7b72d98d83ebb6e Mon Sep 17 00:00:00 2001 From: githubuser0xFFFF Date: Fri, 10 Feb 2023 13:30:41 +0100 Subject: [PATCH 4/8] Update linux-builds.yml --- .github/workflows/linux-builds.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index 339fe75..d1a6026 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -30,6 +30,7 @@ jobs: - name: install qt run: | sudo apt-get update --fix-missing + sudo apt-get install qt6-tools-dev sudo apt-get install qt6-base-dev sudo apt-get install qt6-base-private-dev sudo apt-get install libqt6svg6 From 7192a06eb822e633d3a325ed38ee5ccfe47aa2dd Mon Sep 17 00:00:00 2001 From: githubuser0xFFFF Date: Fri, 10 Feb 2023 13:42:31 +0100 Subject: [PATCH 5/8] Update linux-builds.yml --- .github/workflows/linux-builds.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index d1a6026..97bd8f9 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -29,11 +29,11 @@ jobs: - uses: actions/checkout@v1 - name: install qt run: | - sudo apt-get update --fix-missing - sudo apt-get install qt6-tools-dev - sudo apt-get install qt6-base-dev - sudo apt-get install qt6-base-private-dev - sudo apt-get install libqt6svg6 + sudo apt update --fix-missing + sudo apt install qt6-base-dev + sudo apt install qt6-base-private-dev + sudo apt install qt6-tools-dev-tools + sudo apt install libqt6svg6 - name: qmake run: qmake - name: make From bc9f136f20023b20799c034e1c068286e91150b6 Mon Sep 17 00:00:00 2001 From: githubuser0xFFFF Date: Fri, 10 Feb 2023 13:58:03 +0100 Subject: [PATCH 6/8] Update linux-builds.yml --- .github/workflows/linux-builds.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index 97bd8f9..3d8b20f 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -27,13 +27,14 @@ jobs: steps: - uses: actions/checkout@v1 - - name: install qt - run: | - sudo apt update --fix-missing - sudo apt install qt6-base-dev - sudo apt install qt6-base-private-dev - sudo apt install qt6-tools-dev-tools - sudo apt install libqt6svg6 + - name: Install Qt + uses: jurplel/install-qt-action@v2 + with: + version: 6.2.* + host: linux + target: desktop + archives: 'qtbase qtsvg' + setup-python: false - name: qmake run: qmake - name: make From d8784a22b759d05241975ffa6c2cfeeec5dd1fa1 Mon Sep 17 00:00:00 2001 From: githubuser0xFFFF Date: Fri, 10 Feb 2023 14:09:02 +0100 Subject: [PATCH 7/8] Update linux-builds.yml --- .github/workflows/linux-builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index 3d8b20f..e0a1ad9 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -33,7 +33,7 @@ jobs: version: 6.2.* host: linux target: desktop - archives: 'qtbase qtsvg' + archives: qtbase qtsvg setup-python: false - name: qmake run: qmake From 54c2bd0c304505f9c5abffdd9eaa29ecfd691054 Mon Sep 17 00:00:00 2001 From: githubuser0xFFFF Date: Fri, 10 Feb 2023 14:11:38 +0100 Subject: [PATCH 8/8] Update linux-builds.yml --- .github/workflows/linux-builds.yml | 34 +++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml index e0a1ad9..9c36d50 100644 --- a/.github/workflows/linux-builds.yml +++ b/.github/workflows/linux-builds.yml @@ -24,18 +24,36 @@ jobs: build_ubuntu_2204: runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + - name: Cache Qt + id: cache-qt-6-4 + uses: actions/cache@v1 # not v2! + with: + path: ../Qt/6.4.2 + key: ${{ runner.os }}-QtCache-Qt6-4 + - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: 6.2.* - host: linux - target: desktop - archives: qtbase qtsvg - setup-python: false + version: 6.4.2 + host: linux + target: desktop + install-deps: true + cached: ${{ steps.cache-qt-6-4.outputs.cache-hit }} + setup-python: false + tools: '' + tools-only: false + + - name: Install needed xkbcommon symlink + run: sudo apt-get install libxkbcommon-dev -y + + - name: Ubuntu and Qt version + run: | + cat /etc/issue + echo number of processors: $(nproc) + qmake -v - name: qmake run: qmake - name: make - run: make -j4 + run: make -j$(nproc)