Merge branch 'develop' into feature-refactor-unread-new

This commit is contained in:
Ximi1970
2023-08-25 21:56:59 +02:00

View File

@@ -481,7 +481,12 @@ void SysTrayX::hideKdeTrayIcon()
disconnect( this, &SysTrayX::signalMailCount, m_kde_tray_icon, &SysTrayXStatusNotifier::slotMailCount );
/*
* 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;
@@ -738,7 +743,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() )
{
@@ -754,7 +763,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() )
{