diff --git a/base64/base64.pro b/base64/base64.pro index 6b1000a..edec550 100644 --- a/base64/base64.pro +++ b/base64/base64.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-02-08T09:21:04 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/battery/battery.pro b/battery/battery.pro index 477070a..3a106b1 100644 --- a/battery/battery.pro +++ b/battery/battery.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-02-08T09:46:02 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/bgdemo/bgdemo.pro b/bgdemo/bgdemo.pro index b5ec7df..a24e705 100644 --- a/bgdemo/bgdemo.pro +++ b/bgdemo/bgdemo.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-08-19T20:24:03 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/colorwidget/colorwidget.pro b/colorwidget/colorwidget.pro index 173071e..1b3b62d 100644 --- a/colorwidget/colorwidget.pro +++ b/colorwidget/colorwidget.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-01-05T22:11:54 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/comtool/comtool.pro b/comtool/comtool.pro index 3121037..651d7f9 100644 --- a/comtool/comtool.pro +++ b/comtool/comtool.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2016-09-19T22:25:56 -# -#------------------------------------------------- - -QT += core gui network - +QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/countcode/countcode.pro b/countcode/countcode.pro index 889765a..08afea3 100644 --- a/countcode/countcode.pro +++ b/countcode/countcode.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-02-08T09:21:04 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/dbpage/dbpage.pro b/dbpage/dbpage.pro index bb55919..b466530 100644 --- a/dbpage/dbpage.pro +++ b/dbpage/dbpage.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-01-15T14:34:50 -# -#------------------------------------------------- - -QT += core gui sql - +QT += core gui sql greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/devicebutton/devicebutton.cpp b/devicebutton/devicebutton.cpp index 5c250bb..e981ee5 100644 --- a/devicebutton/devicebutton.cpp +++ b/devicebutton/devicebutton.cpp @@ -202,6 +202,10 @@ void DeviceButton::setButtonColor(const DeviceButton::ButtonColor &buttonColor) imgName = QString(":/image/devicebutton/devicebutton_gray_%1.png").arg(type); } else if (buttonColor == ButtonColor_Black) { imgName = QString(":/image/devicebutton/devicebutton_black_%1.png").arg(type); + } else if (buttonColor == ButtonColor_Purple) { + imgName = QString(":/image/devicebutton/devicebutton_purple_%1.png").arg(type); + } else if (buttonColor == ButtonColor_Yellow) { + imgName = QString(":/image/devicebutton/devicebutton_yellow_%1.png").arg(type); } else if (buttonColor == ButtonColor_Red) { checkAlarm(); if (!timer->isActive()) { diff --git a/devicebutton/devicebutton.h b/devicebutton/devicebutton.h index bc7c104..ee654e8 100644 --- a/devicebutton/devicebutton.h +++ b/devicebutton/devicebutton.h @@ -43,11 +43,13 @@ public: //设备按钮颜色 enum ButtonColor { - ButtonColor_Green = 0, //绿色 设备激活状态 - ButtonColor_Blue = 1, //蓝色 设备在线状态 - ButtonColor_Red = 2, //红色 设备报警状态 - ButtonColor_Gray = 3, //灰色 设备离线状态 - ButtonColor_Black = 4 //黑色 设备故障状态 + ButtonColor_Green = 0, //绿色 激活状态 + ButtonColor_Blue = 1, //蓝色 在线状态 + ButtonColor_Red = 2, //红色 报警状态 + ButtonColor_Gray = 3, //灰色 离线状态 + ButtonColor_Black = 4, //黑色 故障状态 + ButtonColor_Purple = 5, //紫色 其他状态 + ButtonColor_Yellow = 6 //黄色 其他状态 }; explicit DeviceButton(QWidget *parent = 0); diff --git a/devicebutton/devicebutton.pro b/devicebutton/devicebutton.pro index ebbe199..d8dc57b 100644 --- a/devicebutton/devicebutton.pro +++ b/devicebutton/devicebutton.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2018-07-04T09:39:27 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/devicebutton/frmdevicebutton.cpp b/devicebutton/frmdevicebutton.cpp index 7d8da86..967b1a5 100644 --- a/devicebutton/frmdevicebutton.cpp +++ b/devicebutton/frmdevicebutton.cpp @@ -36,7 +36,7 @@ void frmDeviceButton::initForm() connect(btn, SIGNAL(clicked(bool)), this, SLOT(changeStyle())); } - btnColor << ui->btnGreen << ui->btnBlue << ui->btnRed << ui->btnGray << ui->btnBlack; + btnColor << ui->btnGreen << ui->btnBlue << ui->btnRed << ui->btnGray << ui->btnBlack << ui->btnPurple << ui->btnYellow; foreach (QPushButton *btn, btnColor) { connect(btn, SIGNAL(clicked(bool)), this, SLOT(changeColor())); } diff --git a/devicebutton/frmdevicebutton.ui b/devicebutton/frmdevicebutton.ui index 4470065..bce6188 100644 --- a/devicebutton/frmdevicebutton.ui +++ b/devicebutton/frmdevicebutton.ui @@ -129,6 +129,20 @@ + + + + 紫色 + + + + + + + 黄色 + + + diff --git a/devicebutton/image/devicebutton/devicebutton_black_bubble.png b/devicebutton/image/devicebutton/devicebutton_black_bubble.png index 2ab6431..4bc31f5 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_black_bubble.png and b/devicebutton/image/devicebutton/devicebutton_black_bubble.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_black_bubble2.png b/devicebutton/image/devicebutton/devicebutton_black_bubble2.png index cefa46c..d98c28c 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_black_bubble2.png and b/devicebutton/image/devicebutton/devicebutton_black_bubble2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_black_circle.png b/devicebutton/image/devicebutton/devicebutton_black_circle.png index b3fc4ff..d48b695 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_black_circle.png and b/devicebutton/image/devicebutton/devicebutton_black_circle.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_black_msg.png b/devicebutton/image/devicebutton/devicebutton_black_msg.png index f83642d..d25a537 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_black_msg.png and b/devicebutton/image/devicebutton/devicebutton_black_msg.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_black_msg2.png b/devicebutton/image/devicebutton/devicebutton_black_msg2.png index 2705b7c..8335e7a 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_black_msg2.png and b/devicebutton/image/devicebutton/devicebutton_black_msg2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_black_police.png b/devicebutton/image/devicebutton/devicebutton_black_police.png index 9560244..ab56439 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_black_police.png and b/devicebutton/image/devicebutton/devicebutton_black_police.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_blue_bubble.png b/devicebutton/image/devicebutton/devicebutton_blue_bubble.png index ebd4c8e..e8eea64 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_blue_bubble.png and b/devicebutton/image/devicebutton/devicebutton_blue_bubble.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_blue_bubble2.png b/devicebutton/image/devicebutton/devicebutton_blue_bubble2.png index 1b2a5aa..d74c85a 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_blue_bubble2.png and b/devicebutton/image/devicebutton/devicebutton_blue_bubble2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_blue_circle.png b/devicebutton/image/devicebutton/devicebutton_blue_circle.png index b36931f..ab67e8d 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_blue_circle.png and b/devicebutton/image/devicebutton/devicebutton_blue_circle.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_blue_msg.png b/devicebutton/image/devicebutton/devicebutton_blue_msg.png index 99b3703..c7f23ef 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_blue_msg.png and b/devicebutton/image/devicebutton/devicebutton_blue_msg.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_blue_msg2.png b/devicebutton/image/devicebutton/devicebutton_blue_msg2.png index 6774c8a..f05573c 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_blue_msg2.png and b/devicebutton/image/devicebutton/devicebutton_blue_msg2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_blue_police.png b/devicebutton/image/devicebutton/devicebutton_blue_police.png index 52ef298..c226555 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_blue_police.png and b/devicebutton/image/devicebutton/devicebutton_blue_police.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_gray_bubble.png b/devicebutton/image/devicebutton/devicebutton_gray_bubble.png index 8491876..6942dde 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_gray_bubble.png and b/devicebutton/image/devicebutton/devicebutton_gray_bubble.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_gray_bubble2.png b/devicebutton/image/devicebutton/devicebutton_gray_bubble2.png index ba01c52..997e9f9 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_gray_bubble2.png and b/devicebutton/image/devicebutton/devicebutton_gray_bubble2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_gray_circle.png b/devicebutton/image/devicebutton/devicebutton_gray_circle.png index cb971aa..834538a 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_gray_circle.png and b/devicebutton/image/devicebutton/devicebutton_gray_circle.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_gray_msg.png b/devicebutton/image/devicebutton/devicebutton_gray_msg.png index 5b973b5..143cdad 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_gray_msg.png and b/devicebutton/image/devicebutton/devicebutton_gray_msg.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_gray_msg2.png b/devicebutton/image/devicebutton/devicebutton_gray_msg2.png index f27ec02..df05e7d 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_gray_msg2.png and b/devicebutton/image/devicebutton/devicebutton_gray_msg2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_gray_police.png b/devicebutton/image/devicebutton/devicebutton_gray_police.png index 069c5e7..870d772 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_gray_police.png and b/devicebutton/image/devicebutton/devicebutton_gray_police.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_green_bubble.png b/devicebutton/image/devicebutton/devicebutton_green_bubble.png index d9d3cda..b388381 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_green_bubble.png and b/devicebutton/image/devicebutton/devicebutton_green_bubble.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_green_bubble2.png b/devicebutton/image/devicebutton/devicebutton_green_bubble2.png index 0c8951b..3c9d541 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_green_bubble2.png and b/devicebutton/image/devicebutton/devicebutton_green_bubble2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_green_circle.png b/devicebutton/image/devicebutton/devicebutton_green_circle.png index c81334b..a7083b3 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_green_circle.png and b/devicebutton/image/devicebutton/devicebutton_green_circle.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_green_msg.png b/devicebutton/image/devicebutton/devicebutton_green_msg.png index 0375cdc..663d93c 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_green_msg.png and b/devicebutton/image/devicebutton/devicebutton_green_msg.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_green_msg2.png b/devicebutton/image/devicebutton/devicebutton_green_msg2.png index dc56f5f..a97ae1e 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_green_msg2.png and b/devicebutton/image/devicebutton/devicebutton_green_msg2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_green_police.png b/devicebutton/image/devicebutton/devicebutton_green_police.png index fecc8dd..8a30d20 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_green_police.png and b/devicebutton/image/devicebutton/devicebutton_green_police.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_purple_bubble.png b/devicebutton/image/devicebutton/devicebutton_purple_bubble.png new file mode 100644 index 0000000..87f3807 Binary files /dev/null and b/devicebutton/image/devicebutton/devicebutton_purple_bubble.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_purple_bubble2.png b/devicebutton/image/devicebutton/devicebutton_purple_bubble2.png new file mode 100644 index 0000000..22bb8dc Binary files /dev/null and b/devicebutton/image/devicebutton/devicebutton_purple_bubble2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_purple_circle.png b/devicebutton/image/devicebutton/devicebutton_purple_circle.png new file mode 100644 index 0000000..28daae0 Binary files /dev/null and b/devicebutton/image/devicebutton/devicebutton_purple_circle.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_purple_msg.png b/devicebutton/image/devicebutton/devicebutton_purple_msg.png new file mode 100644 index 0000000..6311a43 Binary files /dev/null and b/devicebutton/image/devicebutton/devicebutton_purple_msg.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_purple_msg2.png b/devicebutton/image/devicebutton/devicebutton_purple_msg2.png new file mode 100644 index 0000000..54b9812 Binary files /dev/null and b/devicebutton/image/devicebutton/devicebutton_purple_msg2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_purple_police.png b/devicebutton/image/devicebutton/devicebutton_purple_police.png new file mode 100644 index 0000000..af8ecc1 Binary files /dev/null and b/devicebutton/image/devicebutton/devicebutton_purple_police.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_red_bubble.png b/devicebutton/image/devicebutton/devicebutton_red_bubble.png index 19f36db..1d70d71 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_red_bubble.png and b/devicebutton/image/devicebutton/devicebutton_red_bubble.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_red_bubble2.png b/devicebutton/image/devicebutton/devicebutton_red_bubble2.png index 1e1dce2..8d234d9 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_red_bubble2.png and b/devicebutton/image/devicebutton/devicebutton_red_bubble2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_red_circle.png b/devicebutton/image/devicebutton/devicebutton_red_circle.png index d1216cc..4fadef6 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_red_circle.png and b/devicebutton/image/devicebutton/devicebutton_red_circle.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_red_msg.png b/devicebutton/image/devicebutton/devicebutton_red_msg.png index d800034..50dd231 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_red_msg.png and b/devicebutton/image/devicebutton/devicebutton_red_msg.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_red_msg2.png b/devicebutton/image/devicebutton/devicebutton_red_msg2.png index 991fe5e..50f0f99 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_red_msg2.png and b/devicebutton/image/devicebutton/devicebutton_red_msg2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_red_police.png b/devicebutton/image/devicebutton/devicebutton_red_police.png index 28e624e..c4f9dd4 100644 Binary files a/devicebutton/image/devicebutton/devicebutton_red_police.png and b/devicebutton/image/devicebutton/devicebutton_red_police.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_yellow_bubble.png b/devicebutton/image/devicebutton/devicebutton_yellow_bubble.png new file mode 100644 index 0000000..1d06d6f Binary files /dev/null and b/devicebutton/image/devicebutton/devicebutton_yellow_bubble.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_yellow_bubble2.png b/devicebutton/image/devicebutton/devicebutton_yellow_bubble2.png new file mode 100644 index 0000000..d48de6c Binary files /dev/null and b/devicebutton/image/devicebutton/devicebutton_yellow_bubble2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_yellow_circle.png b/devicebutton/image/devicebutton/devicebutton_yellow_circle.png new file mode 100644 index 0000000..7c5ed59 Binary files /dev/null and b/devicebutton/image/devicebutton/devicebutton_yellow_circle.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_yellow_msg.png b/devicebutton/image/devicebutton/devicebutton_yellow_msg.png new file mode 100644 index 0000000..92c6a5a Binary files /dev/null and b/devicebutton/image/devicebutton/devicebutton_yellow_msg.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_yellow_msg2.png b/devicebutton/image/devicebutton/devicebutton_yellow_msg2.png new file mode 100644 index 0000000..4f41702 Binary files /dev/null and b/devicebutton/image/devicebutton/devicebutton_yellow_msg2.png differ diff --git a/devicebutton/image/devicebutton/devicebutton_yellow_police.png b/devicebutton/image/devicebutton/devicebutton_yellow_police.png new file mode 100644 index 0000000..8c637f3 Binary files /dev/null and b/devicebutton/image/devicebutton/devicebutton_yellow_police.png differ diff --git a/devicebutton/main.cpp b/devicebutton/main.cpp index 0ab185b..3f78510 100644 --- a/devicebutton/main.cpp +++ b/devicebutton/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 diff --git a/devicebutton/main.qrc b/devicebutton/main.qrc index 07d37f5..8eaad14 100644 --- a/devicebutton/main.qrc +++ b/devicebutton/main.qrc @@ -31,5 +31,17 @@ image/devicebutton/devicebutton_red_msg.png image/devicebutton/devicebutton_red_msg2.png image/devicebutton/devicebutton_red_police.png + image/devicebutton/devicebutton_purple_bubble.png + image/devicebutton/devicebutton_purple_bubble2.png + image/devicebutton/devicebutton_purple_circle.png + image/devicebutton/devicebutton_purple_msg.png + image/devicebutton/devicebutton_purple_msg2.png + image/devicebutton/devicebutton_purple_police.png + image/devicebutton/devicebutton_yellow_bubble.png + image/devicebutton/devicebutton_yellow_bubble2.png + image/devicebutton/devicebutton_yellow_circle.png + image/devicebutton/devicebutton_yellow_msg.png + image/devicebutton/devicebutton_yellow_msg2.png + image/devicebutton/devicebutton_yellow_police.png diff --git a/devicesizetable/devicesizetable.pro b/devicesizetable/devicesizetable.pro index 943cb45..cb65c11 100644 --- a/devicesizetable/devicesizetable.pro +++ b/devicesizetable/devicesizetable.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-02-08T10:02:20 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/emailtool/emailtool.pro b/emailtool/emailtool.pro index d1a8e42..c93d19f 100644 --- a/emailtool/emailtool.pro +++ b/emailtool/emailtool.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2016-09-29T13:23:25 -# -#------------------------------------------------- - -QT += core gui network - +QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/ffmpegdemo/ffmpegdemo.pro b/ffmpegdemo/ffmpegdemo.pro index 49bab23..6de5265 100644 --- a/ffmpegdemo/ffmpegdemo.pro +++ b/ffmpegdemo/ffmpegdemo.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2019-02-16T15:08:47 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat android {QT += androidextras} diff --git a/flatui/flatui.pro b/flatui/flatui.pro index 8f683bb..41db326 100644 --- a/flatui/flatui.pro +++ b/flatui/flatui.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-01-09T09:29:12 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/framelesswidget/framelesswidget.pro b/framelesswidget/framelesswidget.pro index b26e72b..6f35268 100644 --- a/framelesswidget/framelesswidget.pro +++ b/framelesswidget/framelesswidget.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2019-10-03T10:55:58 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/gifwidget/gifwidget.pro b/gifwidget/gifwidget.pro index 5b27cd6..a41fd5d 100644 --- a/gifwidget/gifwidget.pro +++ b/gifwidget/gifwidget.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-01-05T22:11:54 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/imageswitch/imageswitch.pro b/imageswitch/imageswitch.pro index 7986074..8190c28 100644 --- a/imageswitch/imageswitch.pro +++ b/imageswitch/imageswitch.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-02-08T14:39:46 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/ipaddress/ipaddress.pro b/ipaddress/ipaddress.pro index cd5976f..67143f4 100644 --- a/ipaddress/ipaddress.pro +++ b/ipaddress/ipaddress.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-08-10T17:11:52 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/lightbutton/lightbutton.pro b/lightbutton/lightbutton.pro index 8418c56..ffca601 100644 --- a/lightbutton/lightbutton.pro +++ b/lightbutton/lightbutton.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-02-08T15:04:18 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/lineeditnext/lineeditnext.pro b/lineeditnext/lineeditnext.pro index 73f4309..0303ac7 100644 --- a/lineeditnext/lineeditnext.pro +++ b/lineeditnext/lineeditnext.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2019-10-28T13:44:49 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/lunarcalendarwidget/lunarcalendarwidget.pro b/lunarcalendarwidget/lunarcalendarwidget.pro index afd86c3..6303eba 100644 --- a/lunarcalendarwidget/lunarcalendarwidget.pro +++ b/lunarcalendarwidget/lunarcalendarwidget.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-01-05T22:11:54 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/maskwidget/maskwidget.pro b/maskwidget/maskwidget.pro index 92fe1cb..4f79156 100644 --- a/maskwidget/maskwidget.pro +++ b/maskwidget/maskwidget.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-01-05T22:11:54 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/miniblink/miniblink.pro b/miniblink/miniblink.pro index 6be1fe9..1894498 100644 --- a/miniblink/miniblink.pro +++ b/miniblink/miniblink.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2019-02-16T15:08:47 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/mouseline/mouseline.pro b/mouseline/mouseline.pro index c70bd02..0502909 100644 --- a/mouseline/mouseline.pro +++ b/mouseline/mouseline.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2018-08-13T14:27:21 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/movewidget/movewidget.pro b/movewidget/movewidget.pro index 865856e..4631947 100644 --- a/movewidget/movewidget.pro +++ b/movewidget/movewidget.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2019-09-28T15:04:18 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/mpvdemo/mpvdemo.pro b/mpvdemo/mpvdemo.pro index 98cd6a4..527f3f5 100644 --- a/mpvdemo/mpvdemo.pro +++ b/mpvdemo/mpvdemo.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2019-02-16T15:08:47 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/navbutton/navbutton.pro b/navbutton/navbutton.pro index 1ddf940..aa4d310 100644 --- a/navbutton/navbutton.pro +++ b/navbutton/navbutton.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-02-08T15:12:35 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/netserver/netserver.pro b/netserver/netserver.pro index 600cec3..5598c92 100644 --- a/netserver/netserver.pro +++ b/netserver/netserver.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2018-09-19T13:33:20 -# -#------------------------------------------------- - -QT += core gui network - +QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/nettool/nettool.pro b/nettool/nettool.pro index e284d27..88da4a9 100644 --- a/nettool/nettool.pro +++ b/nettool/nettool.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2016-09-19T13:33:20 -# -#------------------------------------------------- - -QT += core gui network - +QT += core gui network greaterThan(QT_MAJOR_VERSION, 4) { QT += widgets #判断是否有websocket模块 diff --git a/ntpclient/ntpclient.pro b/ntpclient/ntpclient.pro index 977d902..b9d55c5 100644 --- a/ntpclient/ntpclient.pro +++ b/ntpclient/ntpclient.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2019-02-16T15:08:47 -# -#------------------------------------------------- - -QT += core gui network - +QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/pngtool/pngtool.pro b/pngtool/pngtool.pro index cbee728..c7322b0 100644 --- a/pngtool/pngtool.pro +++ b/pngtool/pngtool.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-02-08T09:21:04 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/savelog/savelog.pro b/savelog/savelog.pro index 86ec593..6cee141 100644 --- a/savelog/savelog.pro +++ b/savelog/savelog.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2019-02-16T15:08:47 -# -#------------------------------------------------- - -QT += core gui network - +QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/saveruntime/saveruntime.pro b/saveruntime/saveruntime.pro index 998eedc..ca217d2 100644 --- a/saveruntime/saveruntime.pro +++ b/saveruntime/saveruntime.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2019-02-16T15:08:47 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/screenwidget/screenwidget.pro b/screenwidget/screenwidget.pro index 682ed7e..3269e29 100644 --- a/screenwidget/screenwidget.pro +++ b/screenwidget/screenwidget.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-01-05T22:11:54 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/smoothcurve/smoothcurve.pro b/smoothcurve/smoothcurve.pro index 8b24791..c8fe1be 100644 --- a/smoothcurve/smoothcurve.pro +++ b/smoothcurve/smoothcurve.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-01-09T09:29:12 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/styledemo/styledemo.pro b/styledemo/styledemo.pro index f406a98..196c292 100644 --- a/styledemo/styledemo.pro +++ b/styledemo/styledemo.pro @@ -1,9 +1,3 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-02-19T12:55:42 -# -#------------------------------------------------- - QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/videopanel/videopanel.pro b/videopanel/videopanel.pro index 2e93891..47b94b6 100644 --- a/videopanel/videopanel.pro +++ b/videopanel/videopanel.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-01-05T22:11:54 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/videowidget/videowidget.pro b/videowidget/videowidget.pro index 5c6933e..52f8294 100644 --- a/videowidget/videowidget.pro +++ b/videowidget/videowidget.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-01-05T22:11:54 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/vlcdemo/vlcdemo.pro b/vlcdemo/vlcdemo.pro index b51d677..bab6540 100644 --- a/vlcdemo/vlcdemo.pro +++ b/vlcdemo/vlcdemo.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2019-02-16T15:08:47 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat diff --git a/zhtopy/zhtopy.pro b/zhtopy/zhtopy.pro index 4c3fa9f..8d3a471 100644 --- a/zhtopy/zhtopy.pro +++ b/zhtopy/zhtopy.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2019-02-16T15:08:47 -# -#------------------------------------------------- - -QT += core gui - +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat