Skip to content

Commit

Permalink
Bump version 3.0.0.0 Final
Browse files Browse the repository at this point in the history
  • Loading branch information
Greedysky committed Dec 5, 2024
1 parent 443a6dc commit 71094c1
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ cmake_minimum_required(VERSION 3.0.0)

project(TTKTinyTools)

set(TTK_MAJOR_VERSION 2)
set(TTK_MINOR_VERSION 8)
set(TTK_MAJOR_VERSION 3)
set(TTK_MINOR_VERSION 0)
set(TTK_PATCH_VERSION 0)
set(TTK_VERSION "${TTK_MAJOR_VERSION}.${TTK_MINOR_VERSION}.${TTK_PATCH_VERSION}.0")

Expand Down
2 changes: 1 addition & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
v2.8.0.0 Final 2024.03.29
v3.0.0.0 Final 2024.12.05
优化部分交互逻辑
优化其他一些细节

Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = TTKTinyTools
PROJECT_NUMBER = 2.8.0.0
PROJECT_NUMBER = 3.0.0.0
PROJECT_BRIEF = "TTKTinyTools是基于Qt的自定义小工具集合"
PROJECT_LOGO = TTKUtils/resource/qicon.dll
OUTPUT_DIRECTORY = TTKDocs
Expand Down
4 changes: 2 additions & 2 deletions TTKCommon/TTKRun/ttkrunobject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void TTKRunObject::run(int argc, char **argv) const
}

args.append(TTK_STR_QUOTES(arg));
args.append(" ");
args.append(TTK_SPACE);
}
}

Expand Down Expand Up @@ -66,6 +66,6 @@ void TTKRunObject::run(int argc, char **argv) const
}
}

system((filePath + suffix + " " + args).c_str());
system((filePath + suffix + TTK_SPACE + args).c_str());
#endif
}
2 changes: 1 addition & 1 deletion TTKCommon/TTKRun/ttkrunobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "ttkobject.h"

#ifdef _MSC_VER
#ifdef _MSC_VER // do not show console window
# pragma comment(linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"")
#endif

Expand Down
8 changes: 4 additions & 4 deletions TTKCommon/ttkversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
* with this program; If not, see <http://www.gnu.org/licenses/>.
***************************************************************************/

//update time 2024.03.28
#define TTK_MAJOR_VERSION 2
#define TTK_MINOR_VERSION 8
//update time 2024.12.05
#define TTK_MAJOR_VERSION 3
#define TTK_MINOR_VERSION 0
#define TTK_PATCH_VERSION 0

#define TTK_VERSION TTK_VERSION_CHECK(TTK_MAJOR_VERSION, TTK_MINOR_VERSION, TTK_PATCH_VERSION, 0)
#define TTK_VERSION_STR TTK_VERSION_CHECK_STR(TTK_MAJOR_VERSION, TTK_MINOR_VERSION, TTK_PATCH_VERSION, 0)
#define TTK_VERSION_TIME_STR "(2024/03/28)"
#define TTK_VERSION_TIME_STR "(2024/12/05)"

#define TTK_RC_FILEVERSION TTK_MAJOR_VERSION, TTK_MINOR_VERSION, TTK_PATCH_VERSION, 0
#define TTK_RC_PRODUCTVERSION TTK_VERSION_STR
Expand Down
2 changes: 1 addition & 1 deletion TTKUtils/linux_time.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
find . -exec touch -c -m -d "2024-03-28 12:00" {} \;
find . -exec touch -c -m -d "2024-12-05 12:00" {} \;
4 changes: 2 additions & 2 deletions TTKVersion.pri
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ RCC_DIR = ./.build/rcc

greaterThan(QT_MAJOR_VERSION, 4): DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050400 QT_DEPRECATED_WARNINGS

# update time 2024.03.28
TTK_VERSION = 2.8.0.0
# update time 2024.12.05
TTK_VERSION = 3.0.0.0

0 comments on commit 71094c1

Please sign in to comment.