Merge pull request #646 from manongjohn/v1.2

Update version to 1.2 (alpha)
This commit is contained in:
manongjohn 2021-04-05 10:16:47 -04:00 committed by GitHub
commit 18f0c94eaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 8 deletions

View file

@ -1,4 +1,4 @@
version: 1.1.0{build} version: 1.2.0{build}
pull_requests: pull_requests:
do_not_increment_build_number: true do_not_increment_build_number: true
skip_tags: true skip_tags: true

View file

@ -23,11 +23,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.1.0</string> <string>1.2.0</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.1</string> <string>1.2</string>
<key>CSResourcesFileMapped</key> <key>CSResourcesFileMapped</key>
<true/> <true/>
<key>LSRequiresCarbon</key> <key>LSRequiresCarbon</key>

View file

@ -18,9 +18,9 @@ public:
private: private:
const char *applicationName = "Tahoma2D"; const char *applicationName = "Tahoma2D";
const float applicationVersion = 1.1; const float applicationVersion = 1.2;
const float applicationRevision = 0; const float applicationRevision = 0;
const char *applicationNote = ""; const char *applicationNote = "(alpha)";
}; };
std::string ToonzVersion::getAppName(void) { std::string ToonzVersion::getAppName(void) {

View file

@ -1,4 +1,4 @@
set(VERSION 1.1) set(VERSION 1.2)
set(MOC_HEADERS set(MOC_HEADERS
aboutpopup.h aboutpopup.h

View file

@ -32,7 +32,7 @@
using namespace DVGui; using namespace DVGui;
QString DialogTitle = "Tahoma2D 1.1"; QString DialogTitle = "Tahoma2D 1.2 (alpha)";
//============================================================================= //=============================================================================
namespace { namespace {

View file

@ -26,6 +26,9 @@
</screenshots> </screenshots>
<content_rating type="oars-1.1"/> <content_rating type="oars-1.1"/>
<releases> <releases>
<release version="1.1.0" date="2020-10-06"/> <release version="1.2.0" type="development" date="2021-04-05"/>
<release version="1.1.0" date="2020-10-30"/>
<release version="1.0.1" date="2020-09-04"/>
<release version="1.0.0" date="2020-09-01"/>
</releases> </releases>
</component> </component>