From 124aa31d9588f1cd442501f19bcbd4bf9874163d Mon Sep 17 00:00:00 2001 From: Greedysky Date: Sat, 26 Jun 2021 20:32:44 +0800 Subject: [PATCH] Bump version 2.2.0.0 Final --- TTKCommon/ttkversion.h | 12 ++++++------ TTKModule/TTKCore.rc | 8 ++++---- TTKModule/TTKNetwork/TTKNetTraffic/mainwindow.cpp | 2 +- TTKThirdParty/TTKThirdParty.rc | 8 ++++---- TTKVersion.pri | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/TTKCommon/ttkversion.h b/TTKCommon/ttkversion.h index 76b3f07..38544c6 100644 --- a/TTKCommon/ttkversion.h +++ b/TTKCommon/ttkversion.h @@ -19,17 +19,17 @@ * with this program; If not, see . ================================================= */ -//update time 2020.07.05 -#define TTKTOOLS_VERSION_STR "2.1.0.0" -#define TTKTOOLS_VERSION_WSTR L"2.1.0.0" -#define TTKTOOLS_VER_TIME_STR "(2020/07/05)" +//update time 2021.06.26 +#define TTKTOOLS_VERSION_STR "2.2.0.0" +#define TTKTOOLS_VERSION_WSTR L"2.2.0.0" +#define TTKTOOLS_VER_TIME_STR "(2021/06/26)" #define TTKTOOLS_MAJOR_VERSION 2 -#define TTKTOOLS_MIDLE_VERSION 1 +#define TTKTOOLS_MIDLE_VERSION 2 #define TTKTOOLS_MINOR_VERSION 0 #define TTKTOOLS_PATCH_VERSION 0 -#define TTKTOOLS_VERSION 0x02100 +#define TTKTOOLS_VERSION 0x02200 #define TTK_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch)) diff --git a/TTKModule/TTKCore.rc b/TTKModule/TTKCore.rc index 915096a..897b73c 100644 --- a/TTKModule/TTKCore.rc +++ b/TTKModule/TTKCore.rc @@ -7,8 +7,8 @@ IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_app_logo.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,0,0 - PRODUCTVERSION 2,1,0,0 + FILEVERSION 2,2,0,0 + PRODUCTVERSION 2,2,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -27,10 +27,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKTinyTools" - VALUE "FileVersion", "2.1.0.0" + VALUE "FileVersion", "2.2.0.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021" VALUE "ProductName", "TTKTinyTools" - VALUE "ProductVersion", "2.1.0.0" + VALUE "ProductVersion", "2.2.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKModule/TTKNetwork/TTKNetTraffic/mainwindow.cpp b/TTKModule/TTKNetwork/TTKNetTraffic/mainwindow.cpp index b7859ed..b92d8d5 100644 --- a/TTKModule/TTKNetwork/TTKNetTraffic/mainwindow.cpp +++ b/TTKModule/TTKNetwork/TTKNetTraffic/mainwindow.cpp @@ -72,7 +72,7 @@ MainWindow::MainWindow(QWidget *parent) move(200, 200); setAttribute(Qt::WA_TranslucentBackground, true); - Qt::WindowFlags flags = 0; + Qt::WindowFlags flags = Qt::WindowFlags(); flags = Qt::Window; flags |=Qt::FramelessWindowHint; flags |= Qt::WindowStaysOnTopHint; diff --git a/TTKThirdParty/TTKThirdParty.rc b/TTKThirdParty/TTKThirdParty.rc index ef4c44b..4f6f98c 100644 --- a/TTKThirdParty/TTKThirdParty.rc +++ b/TTKThirdParty/TTKThirdParty.rc @@ -7,8 +7,8 @@ IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_app_logo.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,0,0 - PRODUCTVERSION 2,1,0,0 + FILEVERSION 2,2,0,0 + PRODUCTVERSION 2,2,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -27,10 +27,10 @@ BEGIN BEGIN VALUE "CompanyName", "Greedysky Studio, Ltd." VALUE "FileDescription", "TTKThirdParty" - VALUE "FileVersion", "2.1.0.0" + VALUE "FileVersion", "2.2.0.0" VALUE "LegalCopyright", "Copyright By Greedysky Studio(C)2021" VALUE "ProductName", "TTKThirdParty" - VALUE "ProductVersion", "2.1.0.0" + VALUE "ProductVersion", "2.2.0.0" END END BLOCK "VarFileInfo" diff --git a/TTKVersion.pri b/TTKVersion.pri index d26eb0e..66f13fe 100644 --- a/TTKVersion.pri +++ b/TTKVersion.pri @@ -21,5 +21,5 @@ MOC_DIR = ./.build/moc OBJECTS_DIR = ./.build/obj RCC_DIR = ./.build/rcc -# update time 2020.07.05 -TTKTinyTools = 2.1.0.0 +# update time 2021.06.26 +TTKTinyTools = 2.2.0.0