Introduce libportal-qt6

Introduce a new libportal-qt6 library with Qt6-specific parent
window exports. It contains a blank header with a single function
declaration (xdp_parent_new_qt), and explicitly depends on Qt6.

This is based on the existing code for libportal-qt5.

Related: #12

Author: Conan-Kudo

.github/workflows/build.yml

@@ -58,11 +58,11 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
-          dnf install -y meson gcc gobject-introspection-devel gtk3-devel gtk4-devel gi-docgen vala git python3-pytest python3-dbusmock
+          dnf install -y meson gcc gobject-introspection-devel gtk3-devel gtk4-devel gi-docgen vala git python3-pytest python3-dbusmock qt5-qtbase-devel qt5-qtx11extras-devel qt6-qtbase-devel
       - name: Check out libportal
         uses: actions/checkout@v3
       - name: Configure libportal
-        run: meson setup --prefix=/usr _build -Dbackend-gtk3=enabled -Dbackend-gtk4=enabled
+        run: meson setup --prefix=/usr _build -Dbackend-gtk3=enabled -Dbackend-gtk4=enabled -Dbackend-qt5=enabled -Dbackend-qt6=enabled
       - name: Build libportal
         run: ninja -C_build
       - name: Deploy Docs
@@ -84,7 +84,7 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
-          dnf install -y meson gcc gobject-introspection-devel gtk3-devel gtk4-devel qt5-qtbase-devel qt5-qtx11extras-devel git libabigail
+          dnf install -y meson gcc gobject-introspection-devel gtk3-devel gtk4-devel qt5-qtbase-devel qt5-qtx11extras-devel qt6-qtbase-devel git libabigail
       - name: Install check-abi
         run: |
           curl https://gitlab.freedesktop.org/hadess/check-abi/-/raw/main/contrib/check-abi-fedora.sh | bash

.github/workflows/flatpak.yml

@@ -61,3 +61,20 @@ jobs:
           bundle: portal-test-qt5.flatpak
           manifest-path: build-aux/org.gnome.PortalTest.Qt5.json
           cache-key: qt5-${{ github.sha }}
+
+  build-flatpak-qt6:
+    name: Qt6
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:kde-6.5
+      options: --privileged
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Build Qt6 portal test
+        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
+        with:
+          bundle: portal-test-qt6.flatpak
+          manifest-path: build-aux/org.gnome.PortalTest.Qt6.json
+          cache-key: qt6-${{ github.sha }}

README.md

@@ -62,7 +62,7 @@ ninja -C _build
 ### `portal-tests`
 
 To generate test binaries, set the `portal-tests` option to any combination of
-`gtk3`, `gtk4`, or `qt5` e.g. `-Dportal-tests=gtk3,gtk4,qt5`. Then run the desired
+`gtk3`, `gtk4`, `qt5`, or `qt6` e.g. `-Dportal-tests=gtk3,gtk4,qt5,qt6`. Then run the desired
 test binary, e.g.:
 
 ```

build-aux/build.sh

@@ -7,7 +7,7 @@ OLD_DIR=`pwd`
 
 cd "$TOP_DIR"
 
-for backend in Gtk3 Gtk4 Qt5; do
+for backend in Gtk3 Gtk4 Qt5 Qt6; do
     flatpak-builder --force-clean --ccache --repo=_build/repo --install --user "_build/app-$backend" "build-aux/org.gnome.PortalTest.${backend}.json"
 done
 

build-aux/org.gnome.PortalTest.Qt6.json

@@ -0,0 +1,32 @@
+{
+    "app-id": "org.gnome.PortalTest.Qt6",
+    "runtime": "org.kde.Platform",
+    "runtime-version": "6.5",
+    "sdk": "org.kde.Sdk",
+    "command": "portal-test-qt6",
+    "finish-args": [
+        "--socket=wayland",
+        "--socket=x11",
+        "--socket=pulseaudio"
+    ],
+    "modules": [
+        {
+            "name": "portal-test-qt6",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
+              "-Dbackend-qt6=enabled",
+              "-Dportal-tests=true",
+              "-Dintrospection=false",
+              "-Dvapi=false",
+              "-Ddocs=false"
+            ],
+            "sources": [
+                {
+                    "type": "dir",
+                    "path": "../"
+                }
+            ]
+        }
+    ]
+}

libportal/meson.build

@@ -264,6 +264,44 @@ if have_cpp and qt5_dep.found()
   enabled_backends += ['qt5']
 endif
 
+########
+# Qt 6 #
+########
+
+if meson.version().version_compare('>= 0.59.0')
+   have_cpp = add_languages('cpp', required: get_option('backend-qt6'))
+   qt6_dep = dependency('qt6', modules: ['Core', 'Gui', 'Widgets'], required: get_option('backend-qt6'))
+
+   if have_cpp and qt6_dep.found()
+     qt6_headers = ['portal-qt6.h']
+     qt6_sources = ['portal-qt6.cpp']
+
+     install_headers(qt6_headers, subdir: 'libportal-qt6')
+
+     libportal_qt6 = library('portal-qt6',
+       qt6_sources,
+       version: version,
+       include_directories: [top_inc, libportal_inc],
+       cpp_args : '-std=c++17',
+       install: true,
+       dependencies: [libportal_dep, qt6_dep],
+       gnu_symbol_visibility: 'hidden',
+     )
+
+     pkgconfig.generate(libportal_qt6,
+       description: 'Portal API wrappers (Qt 6)',
+       name: 'libportal-qt6',
+       requires: [qt6_dep, libportal],
+     )
+
+     libportal_qt6_dep = declare_dependency(
+       dependencies: [libportal_dep, qt6_dep],
+       link_with: libportal_qt6,
+     )
+     enabled_backends += ['qt6']
+   endif
+endif
+
 if meson.version().version_compare('>= 0.54.0')
   summary({'enabled backends': enabled_backends}, section: 'Backends', list_sep: ',')
 endif