Skip to content

Commit

Permalink
Bump version 2.2.0.0 Final
Browse files Browse the repository at this point in the history
  • Loading branch information
Greedysky committed Jun 26, 2021
1 parent 07ba686 commit 124aa31
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
12 changes: 6 additions & 6 deletions TTKCommon/ttkversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
* with this program; If not, see <http://www.gnu.org/licenses/>.
================================================= */

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

Expand Down
8 changes: 4 additions & 4 deletions TTKModule/TTKCore.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion TTKModule/TTKNetwork/TTKNetTraffic/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions TTKThirdParty/TTKThirdParty.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions TTKVersion.pri
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 124aa31

Please sign in to comment.