This is an automated email from the git hooks/post-receive script. unit193-guest pushed a commit to branch master in repository hexalate.
commit 79acc87bcaeda2c9d8bef157331a03a57160957b Author: Unit 193 <unit...@ubuntu.com> Date: Fri Jan 12 00:04:16 2018 -0500 New upstream version 1.1.2 --- NEWS | 4 ++++ hexalate.pro | 9 ++++++--- mac_deploy.sh | 2 +- windows/installer.nsi | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index b2c8984..ad0cf4c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +1.1.2 +----- +* FIXED: Could not compile with Qt 5.10. + 1.1.1 ----- * FIXED: Did not always install translations in Linux. diff --git a/hexalate.pro b/hexalate.pro index 801e231..6d8f95c 100644 --- a/hexalate.pro +++ b/hexalate.pro @@ -1,4 +1,7 @@ -lessThan(QT_VERSION, 5.2) { +lessThan(QT_MAJOR_VERSION, 5) { + error("Hexalate requires Qt 5.2 or greater") +} +equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) { error("Hexalate requires Qt 5.2 or greater") } @@ -7,7 +10,7 @@ QT += widgets CONFIG += warn_on c++11 DEFINES += QT_DEPRECATED_WARNINGS -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050900 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051000 DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT # Allow in-tree builds @@ -18,7 +21,7 @@ DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT } # Set program version -VERSION = 1.1.1 +VERSION = 1.1.2 DEFINES += VERSIONSTR=\\\"$${VERSION}\\\" # Set program name diff --git a/mac_deploy.sh b/mac_deploy.sh index 65360b7..e9e00fe 100755 --- a/mac_deploy.sh +++ b/mac_deploy.sh @@ -2,7 +2,7 @@ APP='Hexalate' BUNDLE="$APP.app" -VERSION='1.1.1' +VERSION='1.1.2' # Remove any previous disk folder or DMG echo -n 'Preparing... ' diff --git a/windows/installer.nsi b/windows/installer.nsi index 5246dcf..ad3b0f4 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -4,7 +4,7 @@ !define APPNAME "Hexalate" !define VERSIONMAJOR 1 !define VERSIONMINOR 1 -!define VERSIONPATCH 1 +!define VERSIONPATCH 2 !define APPVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}" !define ABOUTURL "https://gottcode.org/hexalate/" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/hexalate.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits