From 01f8f11ea92df47b6eae9c1cf514b2ee8865b642 Mon Sep 17 00:00:00 2001 From: shun-iwasawa Date: Sun, 12 Jan 2020 02:13:48 +0900 Subject: [PATCH] v1.4.0 --- appveyor.yml | 2 +- toonz/cmake/BundleInfo.plist.in | 4 ++-- toonz/sources/include/tversion.h | 2 +- toonz/sources/tcleanupper/tcleanupper.cpp | 5 ----- toonz/sources/toonz/CMakeLists.txt | 2 +- toonz/sources/toonzqt/dvdialog.cpp | 2 +- toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6e93a343..1c778fc6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.3.0.{build} +version: 1.4.0.{build} pull_requests: do_not_increment_build_number: true skip_tags: true diff --git a/toonz/cmake/BundleInfo.plist.in b/toonz/cmake/BundleInfo.plist.in index 635da22c..4f674d2d 100644 --- a/toonz/cmake/BundleInfo.plist.in +++ b/toonz/cmake/BundleInfo.plist.in @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.3.0 + 1.4.0 CFBundleSignature ???? CFBundleVersion - 1.3 + 1.4 CSResourcesFileMapped LSRequiresCarbon diff --git a/toonz/sources/include/tversion.h b/toonz/sources/include/tversion.h index 4ce2162a..c8ffe757 100644 --- a/toonz/sources/include/tversion.h +++ b/toonz/sources/include/tversion.h @@ -18,7 +18,7 @@ public: private: const char *applicationName = "OpenToonz"; - const float applicationVersion = 1.3; + const float applicationVersion = 1.4; const float applicationRevision = 0; const char *applicationNote = ""; }; diff --git a/toonz/sources/tcleanupper/tcleanupper.cpp b/toonz/sources/tcleanupper/tcleanupper.cpp index 05746b4d..30f535d6 100644 --- a/toonz/sources/tcleanupper/tcleanupper.cpp +++ b/toonz/sources/tcleanupper/tcleanupper.cpp @@ -844,8 +844,3 @@ int main(int argc, char *argv[]) { } //------------------------------------------------------------------------ -namespace { -const char *toonzVersion = "Toonz 7.1"; -} // namespace - -static string getToonzVersion() { return toonzVersion; } diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt index 02d32867..c617913b 100644 --- a/toonz/sources/toonz/CMakeLists.txt +++ b/toonz/sources/toonz/CMakeLists.txt @@ -1,4 +1,4 @@ -set(VERSION 1.3) +set(VERSION 1.4) set(MOC_HEADERS addfilmstripframespopup.h diff --git a/toonz/sources/toonzqt/dvdialog.cpp b/toonz/sources/toonzqt/dvdialog.cpp index aab5a1b7..88217243 100644 --- a/toonz/sources/toonzqt/dvdialog.cpp +++ b/toonz/sources/toonzqt/dvdialog.cpp @@ -33,7 +33,7 @@ using namespace DVGui; -QString DialogTitle = "OpenToonz 1.3"; +QString DialogTitle = "OpenToonz 1.4"; //============================================================================= namespace { diff --git a/toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml b/toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml index fe60d036..7b2cba13 100644 --- a/toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml +++ b/toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml @@ -28,6 +28,6 @@ - +