From 0678946103662fb07aa9b024a9c433e11911bb73 Mon Sep 17 00:00:00 2001 From: Uwe Date: Mon, 20 Jun 2022 00:56:55 +0200 Subject: [PATCH] [core] update version number NOTE: this is purposely version 0.21, despite the release goal is 1.0 Since we issue weekly builds, people might otherwise misunderstand the version So first when the release goal is reached, FreeCAD becomes version 1.0 --- .github/ISSUE_TEMPLATE/BUG-REPORT.yml | 4 ++-- CMakeLists.txt | 2 +- src/Gui/CommandStd.cpp | 2 +- src/Main/freecad.rc | 2 +- src/Main/freecad.rc.cmake | 2 +- src/Main/freecadCmd.rc.cmake | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml index aa684a3e29..821d8806ed 100644 --- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml +++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml @@ -29,8 +29,8 @@ body: label: Version description: What version of FreeCAD are you running? options: - - 0.19 (Release) - - 0.20 (Development) + - 0.20 (Release) + - 0.21 (Development) validations: required: true - type: textarea diff --git a/CMakeLists.txt b/CMakeLists.txt index f2bd8fbb1c..3722f6b1f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ project(FreeCAD) set(PACKAGE_VERSION_NAME "Vulcan") set(PACKAGE_VERSION_MAJOR "0") -set(PACKAGE_VERSION_MINOR "20") +set(PACKAGE_VERSION_MINOR "21") set(PACKAGE_VERSION_PATCH "0") set(PACKAGE_VERSION_SUFFIX "dev") # either "dev" for development snapshot or "" (empty string) set(FREECAD_VERSION_PATCH "0") # number of patch release (e.g. "4" for the 0.18.4 release) diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp index 45b82253cd..bf4a844336 100644 --- a/src/Gui/CommandStd.cpp +++ b/src/Gui/CommandStd.cpp @@ -223,7 +223,7 @@ Action * StdCmdAbout::createAction(void) Action *pcAction; QString exe = qApp->applicationName(); - pcAction = new Action(this,getMainWindow()); + pcAction = new Action(this, getMainWindow()); pcAction->setText(QCoreApplication::translate( this->className(), getMenuText()).arg(exe)); pcAction->setToolTip(QCoreApplication::translate( diff --git a/src/Main/freecad.rc b/src/Main/freecad.rc index 31c7a1a739..06df08ba68 100644 --- a/src/Main/freecad.rc +++ b/src/Main/freecad.rc @@ -22,7 +22,7 @@ BEGIN VALUE "CompanyName", "${PROJECT_NAME} Team" VALUE "FileDescription", "${PROJECT_NAME} main executable" VALUE "InternalName", "FreeCAD.exe" - VALUE "LegalCopyright", "Copyright (C) 2020" + VALUE "LegalCopyright", "Copyright (C) 2022" VALUE "OriginalFilename", "FreeCAD.exe" VALUE "ProductName", "${PROJECT_NAME}" VALUE "${FREECAD_VERSION}.${PACKAGE_VERSION_SUFFIX}" diff --git a/src/Main/freecad.rc.cmake b/src/Main/freecad.rc.cmake index 231f93cc91..5fd1c1efea 100644 --- a/src/Main/freecad.rc.cmake +++ b/src/Main/freecad.rc.cmake @@ -22,7 +22,7 @@ BEGIN VALUE "CompanyName", "${PROJECT_NAME} Team" VALUE "FileDescription", "${PROJECT_NAME} main executable" VALUE "InternalName", "FreeCAD.exe" - VALUE "LegalCopyright", "Copyright (C) 2020" + VALUE "LegalCopyright", "Copyright (C) 2022" VALUE "OriginalFilename", "FreeCAD.exe" VALUE "ProductName", "${PROJECT_NAME}" VALUE "ProductVersion", "${FREECAD_VERSION}.${FREECAD_VERSION_PATCH}${PACKAGE_VERSION_SUFFIX}" diff --git a/src/Main/freecadCmd.rc.cmake b/src/Main/freecadCmd.rc.cmake index 05aa2798e6..acb5ed4585 100644 --- a/src/Main/freecadCmd.rc.cmake +++ b/src/Main/freecadCmd.rc.cmake @@ -22,7 +22,7 @@ BEGIN VALUE "CompanyName", "${PROJECT_NAME} Team" VALUE "FileDescription", "${PROJECT_NAME} command line executable" VALUE "InternalName", "FreeCADCmd.exe" - VALUE "LegalCopyright", "Copyright (C) 2020" + VALUE "LegalCopyright", "Copyright (C) 2022" VALUE "OriginalFilename", "FreeCADCmd.exe" VALUE "ProductName", "${PROJECT_NAME}" VALUE "ProductVersion", "${FREECAD_VERSION}.${FREECAD_VERSION_PATCH}${PACKAGE_VERSION_SUFFIX}"