重新改进支持Qt4.6-Qt6.1

live/livetool/trayicon.cpp

@@ -4,14 +4,13 @@
 #include "qmutex.h"
 #include "qmenu.h"
 #include "qapplication.h"
-#include "qdesktopwidget.h"
 #include "qdebug.h"
 
 QScopedPointer<TrayIcon> TrayIcon::self;
 TrayIcon *TrayIcon::Instance()
 {
     if (self.isNull()) {
-        QMutex mutex;
+        static QMutex mutex;
         QMutexLocker locker(&mutex);
         if (self.isNull()) {
             self.reset(new TrayIcon);
@@ -27,21 +26,21 @@ TrayIcon::TrayIcon(QObject *parent) : QObject(parent)
     trayIcon = new QSystemTrayIcon(this);
     connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
             this, SLOT(iconIsActived(QSystemTrayIcon::ActivationReason)));
-    menu = new QMenu(QApplication::desktop());
+    menu = new QMenu;
     exitDirect = true;
 }
 
 void TrayIcon::iconIsActived(QSystemTrayIcon::ActivationReason reason)
 {
     switch (reason) {
-    case QSystemTrayIcon::Trigger:
-    case QSystemTrayIcon::DoubleClick: {
-        mainWidget->showNormal();
-        break;
-    }
+        case QSystemTrayIcon::Trigger:
+        case QSystemTrayIcon::DoubleClick: {
+            mainWidget->showNormal();
+            break;
+        }
 
-    default:
-        break;
+        default:
+            break;
     }
 }
 

live/livetool/trayicon.h

@@ -3,10 +3,10 @@
 
 /**
  * 托盘图标控件 作者:feiyangqingyun(QQ:517216493) 2017-1-8
- * 1:可设置托盘图标对应所属主窗体
- * 2:可设置托盘图标
- * 3:可设置提示信息
- * 4:自带右键菜单
+ * 1. 可设置托盘图标对应所属主窗体
+ * 2. 可设置托盘图标
+ * 3. 可设置提示信息
+ * 4. 自带右键菜单
  */
 
 #include <QObject>
@@ -15,13 +15,7 @@
 class QMenu;
 
 #ifdef quc
-#if (QT_VERSION < QT_VERSION_CHECK(5,7,0))
-#include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
-
-class QDESIGNER_WIDGET_EXPORT TrayIcon : public QObject
+class Q_DECL_EXPORT TrayIcon : public QObject
 #else
 class TrayIcon : public QObject
 #endif