From d8b4b1070c291680946f6af7f3783379fe9d52e4 Mon Sep 17 00:00:00 2001 From: Mentalflow <312902918@qq.com> Date: Mon, 5 Feb 2024 10:13:26 +0800 Subject: [PATCH] Project Version: use Semver and bump to V1.0.1. --- example/CMakeLists.txt | 4 ++-- example/resources/icon.rc | 2 +- lib_source/CMakeLists.txt | 4 ++-- lib_source/ribbonui.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 6e02905..1037e45 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.21) -project(RibbonUIAPP VERSION 1.0.0.0 LANGUAGES CXX) +project(RibbonUIAPP VERSION 1.0.1 LANGUAGES CXX) set(CMAKE_AUTOMOC ON) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -14,7 +14,7 @@ set(PROJECT_COPYRIGHT "Copyright (c) 2023 Mentalflow's Lab. All rights reserved. set(PROJECT_DOMAIN "dev.ourdocs.cn.ribbonuiapp") set(PROJECT_BUNDLE_NAME RibbonUI-APP) -add_definitions(-DRIBBONUIAPP_VERSION=1,0,0,0) +add_definitions(-DRIBBONUIAPP_VERSION=1,0,1) find_package(Qt6 COMPONENTS Quick REQUIRED) diff --git a/example/resources/icon.rc b/example/resources/icon.rc index 3e48f9e..169f8e0 100644 --- a/example/resources/icon.rc +++ b/example/resources/icon.rc @@ -3,7 +3,7 @@ IDI_ICON1 ICON "imgs/icon.ico" #define STR(x) #x -#define VER_JOIN(a,b,c,d) STR(a.b.c.d) +#define VER_JOIN(a,b,c) STR(a.b.c) #define VER_JOIN_(x) VER_JOIN x #define VER_STR VER_JOIN_((RIBBONUIAPP_VERSION)) diff --git a/lib_source/CMakeLists.txt b/lib_source/CMakeLists.txt index 025d672..e0d2868 100644 --- a/lib_source/CMakeLists.txt +++ b/lib_source/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.21) -project(RibbonUI VERSION 1.0.0.0 LANGUAGES CXX) +project(RibbonUI VERSION 1.0.1 LANGUAGES CXX) set(CMAKE_AUTOMOC ON) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -11,7 +11,7 @@ endif() find_package(Qt6 6.2 COMPONENTS Core Quick Qml ShaderTools REQUIRED) -add_definitions(-DRIBBONUI_VERSION=1,0,0,0) +add_definitions(-DRIBBONUI_VERSION=1,0,1) if (RIBBONUI_BUILD_STATIC_LIB) set(LIB_TYPE "STATIC") diff --git a/lib_source/ribbonui.cpp b/lib_source/ribbonui.cpp index 599b03a..c79ea3d 100644 --- a/lib_source/ribbonui.cpp +++ b/lib_source/ribbonui.cpp @@ -1,7 +1,7 @@ #include "ribbonui.h" #include #define STR(x) #x -#define JOIN(a,b,c,d) STR(a.b.c.d) +#define JOIN(a,b,c) STR(a.b.c) #define VER_JOIN(x) JOIN x RibbonUI::RibbonUI(QQuickItem *parent)