From b257948206ba75f9a241fafab346d91a07bca720 Mon Sep 17 00:00:00 2001 From: Firgen Date: Sun, 20 Nov 2022 12:12:36 +0100 Subject: [PATCH] qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct qt6ct.sh should have the same check as qt5ct.sh --- srcpkgs/qt6ct/files/qt6ct.sh | 7 +++++-- srcpkgs/qt6ct/template | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6ct/files/qt6ct.sh b/srcpkgs/qt6ct/files/qt6ct.sh index e4e7708d8a29..b2f12f60825d 100644 --- a/srcpkgs/qt6ct/files/qt6ct.sh +++ b/srcpkgs/qt6ct/files/qt6ct.sh @@ -1,6 +1,9 @@ -#!/usr/bin/env sh +#!/bin/sh + +if [ "$XDG_CURRENT_DESKTOP" != "KDE" ]; then + export QT_QPA_PLATFORMTHEME=qt5ct +fi -export QT_QPA_PLATFORMTHEME=qt5ct if [ "$XDG_SESSION_TYPE" = "wayland" ]; then export QT_QPA_PLATFORM=wayland fi diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template index db5aac26a364..aed240a398da 100644 --- a/srcpkgs/qt6ct/template +++ b/srcpkgs/qt6ct/template @@ -1,7 +1,7 @@ # Template file for 'qt6ct' pkgname=qt6ct version=0.7 -revision=1 +revision=2 build_style=cmake configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="qt6-tools-devel"