From e386c30580aa44291ff3a6bb7e9e7a1a3ec0c71a Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sat, 20 Sep 2025 22:29:59 +0200 Subject: [PATCH] Add Qt debug options --- Makefile | 26 ++++++++++++---------- app/SysTray-X/SysTray-X-app/windowctrl.cpp | 21 ++++++++++------- app/SysTray-X/SysTray-X.pri | 9 ++++++++ 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index a168757..054fdf6 100644 --- a/Makefile +++ b/Makefile @@ -1,22 +1,24 @@ SYSTEM = ifeq (Cygwin,$(shell uname -o)) - SYSTEM = Windows + SYSTEM = Windows else ifeq (GNU/Linux,$(shell uname -o)) - SYSTEM = Linux - - QMAKE = qmake-qt5 - ifeq (, $(shell which qmake-qt5 2>/dev/null)) - QMAKE = qmake6 - ifeq (, $(shell which qmake6 2>/dev/null)) - ifeq (, $(shell which qmake 2>/dev/null)) - $(error "No qmake in $(PATH)") + SYSTEM = Linux + + ifndef QMAKE + QMAKE = qmake-qt5 + ifeq (, $(shell which qmake-qt5 2>/dev/null)) + QMAKE = qmake6 + ifeq (, $(shell which qmake6 2>/dev/null)) + ifeq (, $(shell which qmake 2>/dev/null)) + $(error "No qmake in $(PATH)") + endif + QMAKE = qmake + endif endif - QMAKE = qmake - endif endif else - $(error "Unknown system") + $(error "Unknown system") endif endif diff --git a/app/SysTray-X/SysTray-X-app/windowctrl.cpp b/app/SysTray-X/SysTray-X-app/windowctrl.cpp index e715fe8..9277509 100644 --- a/app/SysTray-X/SysTray-X-app/windowctrl.cpp +++ b/app/SysTray-X/SysTray-X-app/windowctrl.cpp @@ -6,6 +6,7 @@ #include #include #include +#include /* * System includes @@ -69,11 +70,15 @@ bool WindowCtrl::thunderbirdStart() const */ void WindowCtrl::slotWindowTest1() { - emit signalConsole("Test 1 started"); + emit signalConsole( "Test 1 started" ); + + QString platform = QGuiApplication::platformName(); + + emit signalConsole( QString( "Platform: %1" ).arg( platform ) ); // Do something. - emit signalConsole("Test 1 done"); + emit signalConsole( "Test 1 done" ); } @@ -82,11 +87,11 @@ void WindowCtrl::slotWindowTest1() */ void WindowCtrl::slotWindowTest2() { - emit signalConsole("Test 2 started"); + emit signalConsole( "Test 2 started" ); // Do something. - emit signalConsole("Test 2 done"); + emit signalConsole( "Test 2 done" ); } @@ -95,11 +100,11 @@ void WindowCtrl::slotWindowTest2() */ void WindowCtrl::slotWindowTest3() { - emit signalConsole("Test 3 started"); + emit signalConsole( "Test 3 started" ); // Do something. - emit signalConsole("Test 3 done"); + emit signalConsole( "Test 3 done" ); } @@ -108,11 +113,11 @@ void WindowCtrl::slotWindowTest3() */ void WindowCtrl::slotWindowTest4() { - emit signalConsole("Test 4 started"); + emit signalConsole( "Test 4 started" ); // Do something. - emit signalConsole("Test 4 done"); + emit signalConsole( "Test 4 done" ); } /* diff --git a/app/SysTray-X/SysTray-X.pri b/app/SysTray-X/SysTray-X.pri index de8e79b..56eebcb 100644 --- a/app/SysTray-X/SysTray-X.pri +++ b/app/SysTray-X/SysTray-X.pri @@ -1,3 +1,12 @@ +# +# Force gcc 10 for Qt 6 +# +greaterThan(QT_MAJOR_VERSION, 5): { + QMAKE_CC = gcc-10 + QMAKE_CXX = g++-10 +} + + # # Git version getters #