From f72e0e054013b78fd9fb658e7a97520ddb93b518 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Fri, 25 Aug 2023 21:37:07 +0200 Subject: [PATCH 1/2] Fix deprecated qt enum --- app/SysTray-X/SysTray-X-app/systrayx.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/SysTray-X/SysTray-X-app/systrayx.cpp b/app/SysTray-X/SysTray-X-app/systrayx.cpp index b11b88c..f06e9c5 100644 --- a/app/SysTray-X/SysTray-X-app/systrayx.cpp +++ b/app/SysTray-X/SysTray-X-app/systrayx.cpp @@ -732,7 +732,11 @@ void SysTrayX::slotStartApp() { QString app = m_preferences->getStartApp(); QString args = m_preferences->getStartAppArgs(); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) QStringList args_list = args.split( ' ', Qt::SkipEmptyParts ); +#else + QStringList args_list = args.split( ' ', QString::SkipEmptyParts ); +#endif if( !app.isEmpty() ) { @@ -748,7 +752,11 @@ void SysTrayX::slotCloseApp() { QString app = m_preferences->getCloseApp(); QString args = m_preferences->getCloseAppArgs(); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList args_list = args.split( ' ', Qt::SkipEmptyParts ); +#else + QStringList args_list = args.split( ' ', QString::SkipEmptyParts ); +#endif if( !app.isEmpty() ) { From 5a73e77f65f9ccdd7e2d31583600f89357886140 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Fri, 25 Aug 2023 21:49:29 +0200 Subject: [PATCH 2/2] Fix deprecated qt enum --- app/SysTray-X/SysTray-X-app/systrayx.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/SysTray-X/SysTray-X-app/systrayx.cpp b/app/SysTray-X/SysTray-X-app/systrayx.cpp index f06e9c5..92954f9 100644 --- a/app/SysTray-X/SysTray-X-app/systrayx.cpp +++ b/app/SysTray-X/SysTray-X-app/systrayx.cpp @@ -476,7 +476,12 @@ void SysTrayX::hideKdeTrayIcon() disconnect( this, &SysTrayX::signalUnreadMail, m_kde_tray_icon, &SysTrayXStatusNotifier::slotSetUnreadMail ); /* - * Remove the notifier icon + * Remove the notifier icon#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QStringList args_list = args.split( ' ', Qt::SkipEmptyParts ); +#else + QStringList args_list = args.split( ' ', QString::SkipEmptyParts ); +#endif + */ delete m_kde_tray_icon; m_kde_tray_icon = nullptr; @@ -732,7 +737,7 @@ void SysTrayX::slotStartApp() { QString app = m_preferences->getStartApp(); QString args = m_preferences->getStartAppArgs(); -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QStringList args_list = args.split( ' ', Qt::SkipEmptyParts ); #else QStringList args_list = args.split( ' ', QString::SkipEmptyParts );