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

maskwidget/main.cpp

@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     a.setFont(QFont("Microsoft Yahei", 9));
 
-#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
 #if _MSC_VER
     QTextCodec *codec = QTextCodec::codecForName("gbk");
 #else

maskwidget/maskwidget.cpp

@@ -2,10 +2,19 @@
 
 #include "maskwidget.h"
 #include "qmutex.h"
-#include "qdesktopwidget.h"
 #include "qapplication.h"
 #include "qdebug.h"
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
+#include "qscreen.h"
+#define deskGeometry qApp->primaryScreen()->geometry()
+#define deskGeometry2 qApp->primaryScreen()->availableGeometry()
+#else
+#include "qdesktopwidget.h"
+#define deskGeometry qApp->desktop()->geometry()
+#define deskGeometry2 qApp->desktop()->availableGeometry()
+#endif
+
 QScopedPointer<MaskWidget> MaskWidget::self;
 MaskWidget *MaskWidget::Instance()
 {
@@ -27,7 +36,7 @@ MaskWidget::MaskWidget(QWidget *parent) : QWidget(parent)
     setBgColor(QColor(0, 0, 0));
 
     //不设置主窗体则遮罩层大小为默认桌面大小
-    this->setGeometry(qApp->desktop()->geometry());
+    this->setGeometry(deskGeometry);
     this->setWindowFlags(Qt::FramelessWindowHint | Qt::Tool);
 
     //绑定全局事件,过滤弹窗窗体进行处理

maskwidget/maskwidget.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = maskwidget
 TEMPLATE    = app