sync: from linuxdeepin/qt5integration

Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#257
linuxdeepin · Jan 14, 2025 · 22ac4c9 · 22ac4c9
1 parent c6dcb4a
commit 22ac4c9
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/3rdparty/qdbustrayicon.cpp b/3rdparty/qdbustrayicon.cpp
@@ -56,10 +56,14 @@ static QString iconTempPath()
     return QDir::tempPath();
 }
 
-static const QString KDEItemFormat = QStringLiteral("org.kde.StatusNotifierItem-%1-%2")
-                                         .arg(QDBusConnection::sessionBus().baseService().replace(
-                                             QRegularExpression(QStringLiteral("[\\.:]")), QStringLiteral("_")));
-
+// delay to access dbus.
+static QString KDEItemFormat()
+{
+    static const QString KDEItemFormat = QStringLiteral("org.kde.StatusNotifierItem-%1-%2")
+                                             .arg(QDBusConnection::sessionBus().baseService().replace(
+                                                 QRegularExpression(QStringLiteral("[\\.:]")), QStringLiteral("_")));
+    return KDEItemFormat;
+}
 static const QString KDEWatcherService = QStringLiteral("org.kde.StatusNotifierWatcher");
 static const QString XdgNotificationService = QStringLiteral("org.freedesktop.Notifications");
 static const QString XdgNotificationPath = QStringLiteral("/org/freedesktop/Notifications");
@@ -83,7 +87,7 @@ QDBusTrayIcon::QDBusTrayIcon()
     , m_menuAdaptor(nullptr)
     , m_menu(nullptr)
     , m_notifier(nullptr)
-    , m_instanceId(KDEItemFormat.arg(instanceCount))
+    , m_instanceId(KDEItemFormat().arg(instanceCount))
     , m_category(QStringLiteral("ApplicationStatus"))
     , m_defaultStatus(QStringLiteral("Active")) // be visible all the time.  QSystemTrayIcon has no API to control this.
     , m_status(m_defaultStatus)