From 6db32e78eb7e9d6ad93680ea0439a9f2f608c214 Mon Sep 17 00:00:00 2001 From: Firefly35 Date: Mon, 17 Aug 2020 14:46:56 +0200 Subject: [PATCH] update remaken version to 1.7.1 update builddefs-qmake to 4.6.1 feat[init]: set default qmake tag to 4.6.1 for init command. update CHANGELOG.md --- CHANGELOG.md | 7 +++---- builddefs/qmake | 2 +- remaken.pro | 2 +- src/Constants.h | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 231851d..bd8a439 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,5 @@ ### Remaken evolutions -- Update remaken version to 1.7.0 -- Update builddefs/qmake to 4.6.0 -- Add support for conan index: conan-center packages url are created without appending the '@user/channel' suffix, for packages from other remotes the '@user/channel' suffix is still added. -- Init command default qmake tag is set to 4.6.0. +- Update remaken version to 1.7.1 +- Update builddefs/qmake to 4.6.1 +- Init command default qmake tag is set to 4.6.1. diff --git a/builddefs/qmake b/builddefs/qmake index 291d62d..6e7c5c2 160000 --- a/builddefs/qmake +++ b/builddefs/qmake @@ -1 +1 @@ -Subproject commit 291d62d22db3c19e59156061cc0385a9beb0aa93 +Subproject commit 6e7c5c23d2781995b77e3f908db0eb0d0fae52c8 diff --git a/remaken.pro b/remaken.pro index 8416a7c..b6bc7b4 100755 --- a/remaken.pro +++ b/remaken.pro @@ -1,5 +1,5 @@ TARGET = remaken -VERSION=1.7.0 +VERSION=1.7.1 CONFIG += c++1z CONFIG += console diff --git a/src/Constants.h b/src/Constants.h index 72dc960..753074c 100644 --- a/src/Constants.h +++ b/src/Constants.h @@ -35,7 +35,7 @@ class Constants { static constexpr const char * REMAKEN_PROFILES_FOLDER = "profiles"; static constexpr const char * REMAKEN_CACHE_FILE = ".remaken-cache"; static constexpr const char * ARTIFACTORY_API_KEY = "artifactoryApiKey"; - static constexpr const char * QMAKE_RULES_DEFAULT_TAG = "4.6.0"; + static constexpr const char * QMAKE_RULES_DEFAULT_TAG = "4.6.1"; }; #include