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

flatui/flatui.h

@@ -29,7 +29,7 @@ class Q_DECL_EXPORT FlatUI
 class FlatUI
 #endif
 
-{    
+{
 public:
     //设置按钮样式
     static QString setPushButtonQss(QPushButton *btn,                               //按钮对象

flatui/flatui.pro

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

flatui/frmflatui.cpp

@@ -4,7 +4,6 @@
 #include "ui_frmflatui.h"
 #include "flatui.h"
 #include "qdebug.h"
-#include "qdesktopwidget.h"
 #include "qdatetime.h"
 
 frmFlatUI::frmFlatUI(QWidget *parent) : QWidget(parent), ui(new Ui::frmFlatUI)
@@ -58,7 +57,7 @@ void frmFlatUI::initForm()
     FlatUI::setScrollBarQss(ui->verticalScrollBar, 8, 120, 20, "#606060", "#34495E", "#1ABC9C", "#E74C3C");
 
     //设置列数和列宽
-    int width = qApp->desktop()->availableGeometry().width() - 120;
+    int width = 1920;
     ui->tableWidget->setColumnCount(5);
     ui->tableWidget->setColumnWidth(0, width * 0.06);
     ui->tableWidget->setColumnWidth(1, width * 0.10);
@@ -82,7 +81,6 @@ void frmFlatUI::initForm()
 
     for (int i = 0; i < 300; i++) {
         ui->tableWidget->setRowHeight(i, 24);
-
         QTableWidgetItem *itemDeviceID = new QTableWidgetItem(QString::number(i + 1));
         QTableWidgetItem *itemDeviceName = new QTableWidgetItem(QString("测试设备%1").arg(i + 1));
         QTableWidgetItem *itemDeviceAddr = new QTableWidgetItem(QString::number(i + 1));
@@ -95,5 +93,4 @@ void frmFlatUI::initForm()
         ui->tableWidget->setItem(i, 3, itemContent);
         ui->tableWidget->setItem(i, 4, itemTime);
     }
-
 }

flatui/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