From a4729f85a28e1955aa0ce7df198a9a814615f1c2 Mon Sep 17 00:00:00 2001 From: Jussi Lind Date: Sat, 30 Dec 2017 15:09:21 +0200 Subject: [PATCH] 2.0.1 --- CHANGELOG | 6 ++++++ CMakeLists.txt | 2 +- RELEASES | 16 ++++++++++++++++ packaging/debian/changelog | 7 +++++++ packaging/windows/dustrac.nsi | 2 +- src/editor/editor.pro | 2 +- src/game/game.pro | 2 +- 7 files changed, 33 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 44f423f3..2eba9ea2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +2.0.1 +----- + +* Editor: use qSetGlobalQHashSeed with Qt 5.6+ +* Properly check for empty version in mxeWindowsBuild.sh + 2.0.0 ----- diff --git a/CMakeLists.txt b/CMakeLists.txt index 037e19f3..3a647943 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ endif() # Global game version set(VERSION_MAJOR "2") set(VERSION_MINOR "0") -set(VERSION_PATCH "0") +set(VERSION_PATCH "1") set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") option(ReleaseBuild "This should be used when creating DEB and RPM packages." OFF) diff --git a/RELEASES b/RELEASES index 2854b14c..78510508 100644 --- a/RELEASES +++ b/RELEASES @@ -1,3 +1,19 @@ +2.0.1 +===== + +A bug fix release to fix build on Qt 5.6+ + +Bug fixes: + +* Editor: use qSetGlobalQHashSeed with Qt 5.6+ + + qt_qhash_seed is no more exported in recent Qt 5.9.x versions, so use + the public functions for it available since Qt 5.6. + +Other: + +* Properly check for empty version in mxeWindowsBuild.sh + 2.0.0 ===== diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 8db277c3..b2e1ecf4 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,10 @@ +dustrac (2.0.1-1) xenial; urgency=medium + + * Editor: use qSetGlobalQHashSeed with Qt 5.6+ + * Properly check for empty version in mxeWindowsBuild.sh + + -- Jussi Lind Sat, 30 Dec 2017 15:08:11 +0200 + dustrac (2.0.0-1) xenial; urgency=medium * CMake: Set C++ standard with set_property() diff --git a/packaging/windows/dustrac.nsi b/packaging/windows/dustrac.nsi index 320ac429..acb90808 100644 --- a/packaging/windows/dustrac.nsi +++ b/packaging/windows/dustrac.nsi @@ -7,7 +7,7 @@ !define DESCRIPTION "A traditional top-down racing game." !define VERSIONMAJOR 2 !define VERSIONMINOR 0 -!define VERSIONBUILD 0 +!define VERSIONBUILD 1 !define HELPURL "http://juzzlin.github.io/DustRacing2D/" !define UPDATEURL "https://github.com/juzzlin/DustRacing2D/releases" !define ABOUTURL "http://juzzlin.github.io/DustRacing2D/" diff --git a/src/editor/editor.pro b/src/editor/editor.pro index b5fce42b..05d47d71 100644 --- a/src/editor/editor.pro +++ b/src/editor/editor.pro @@ -3,7 +3,7 @@ TEMPLATE = app TARGET = dustrac-editor -DEFINES += DATA_PATH=\\\"./data\\\" VERSION=\\\"2.0.0\\\" +DEFINES += DATA_PATH=\\\"./data\\\" VERSION=\\\"2.0.1\\\" QMAKE_CXXFLAGS += -std=gnu++11 # Qt version check diff --git a/src/game/game.pro b/src/game/game.pro index d2db7580..0023b4bf 100644 --- a/src/game/game.pro +++ b/src/game/game.pro @@ -3,7 +3,7 @@ TEMPLATE = app TARGET = dustrac-game -DEFINES += DATA_PATH=\\\"./data\\\" VERSION=\\\"2.0.0\\\" +DEFINES += DATA_PATH=\\\"./data\\\" VERSION=\\\"2.0.1\\\" QMAKE_CXXFLAGS += -O3 -std=gnu++11 -fomit-frame-pointer -finline-functions -ffast-math # Qt version check