From 32457c5538ee7831e6aa5f6bb9c525ccb55af076 Mon Sep 17 00:00:00 2001 From: micpub Date: Fri, 30 Dec 2022 03:35:20 +0100 Subject: [PATCH] fix qmake linux build, and fix the "Quick" example (#194) * fix: qmake linux build * little fix for the "Quick" example Window.qml / ApplicationWindow.qml: fix: "FramelessApplicationWindow.onClosing" is not available in org.wangwenx190.FramelessHelper 1.0. * remove xcb - as requested --- examples/quick/ApplicationWindow.qml | 8 +++++++- examples/quick/Window.qml | 8 +++++++- qmake/core.pri | 3 +++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/examples/quick/ApplicationWindow.qml b/examples/quick/ApplicationWindow.qml index d91b0f3..a6d4b8b 100644 --- a/examples/quick/ApplicationWindow.qml +++ b/examples/quick/ApplicationWindow.qml @@ -43,7 +43,13 @@ FramelessApplicationWindow { } return FramelessUtils.defaultSystemLightColor; } - onClosing: Settings.saveGeometry(window) + Connections { + target: window + function onClosing(close) + { + Settings.saveGeometry(window) + } + } FramelessHelper.onReady: { // Let FramelessHelper know what's our homemade title bar, otherwise diff --git a/examples/quick/Window.qml b/examples/quick/Window.qml index af0b979..f318e8e 100644 --- a/examples/quick/Window.qml +++ b/examples/quick/Window.qml @@ -43,7 +43,13 @@ FramelessWindow { } return FramelessUtils.defaultSystemLightColor; } - onClosing: Settings.saveGeometry(window) + Connections { + target: window + function onClosing(close) + { + Settings.saveGeometry(window) + } + } FramelessHelper.onReady: { // Let FramelessHelper know what's our homemade title bar, otherwise diff --git a/qmake/core.pri b/qmake/core.pri index 54cf9c6..c91662e 100644 --- a/qmake/core.pri +++ b/qmake/core.pri @@ -64,6 +64,9 @@ win32 { } unix:!macx { + CONFIG += link_pkgconfig + PKGCONFIG += gtk+-3.0 + DEFINES += GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6 HEADERS += \ $$CORE_PUB_INC_DIR/framelesshelper_linux.h SOURCES += \