From b1465cf4808813e81f842fc896bc381af279b5e3 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Thu, 13 Aug 2020 12:55:47 -0400
Subject: [PATCH] misc: default build with Qt 5.15.0
Qt 5.15.0 is currently the minumum build version.
Change-Id: I05273b4addf530aae046934c59eeec8811562558
Gitlab: #581
---
copy-runtime-files.ps1 | 8 ++++++--
make-client.py | 8 +++++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/copy-runtime-files.ps1 b/copy-runtime-files.ps1
index 4db585319..78521ce2b 100644
--- a/copy-runtime-files.ps1
+++ b/copy-runtime-files.ps1
@@ -9,11 +9,15 @@ param (
write-host "Copying runtime files..." -ForegroundColor Green
# default values
-$qtver = If ($qtver) {$qtver} Else {"5.9.4"}
+$qtver = If ($qtver) {$qtver} Else {"5.15.0"}
$mode = If ($mode) {$mode} Else {"Release"}
$qtverSplit1, $qtverSplit2 ,$qtverSplit3 = $qtver.Split('.')
-$qtMsvcDir = If((([int]$qtverSplit1) -ge 6) -OR ( (([int]$qtverSplit1) -eq 5) -AND (([int]$qtverSplit2) -ge 15))){"msvc2019_64"} Else{"msvc2017_64"}
+$qtMsvcDir = If((([int]$qtverSplit1) -ge 6) -OR ( (([int]$qtverSplit1) -eq 5) -AND (([int]$qtverSplit2) -ge 15))) {
+ "msvc2019_64"
+} Else {
+ "msvc2017_64"
+}
$QtDir = "C:\Qt\$qtver\$qtMsvcDir"
diff --git a/make-client.py b/make-client.py
index ad0e0440c..1871f73f9 100644
--- a/make-client.py
+++ b/make-client.py
@@ -111,7 +111,7 @@ def replace_vs_prop(filename, prop, val):
print(re.sub(p, val, line), end='')
-def deps(arch, toolset, qtver):
+def deps(arch, toolset):
print('Deps Qt Client Release|' + arch)
# Fetch QRencode
@@ -133,6 +133,8 @@ def deps(arch, toolset, qtver):
def build(arch, toolset, sdk_version, config_str, project_path_under_current_path, qtver, force_option=True):
+ print("Building with Qt " + qtver)
+
configuration_type = 'StaticLibrary'
qtFolderDir = "msvc2017_64"
@@ -224,7 +226,7 @@ def parse_args():
'-t', '--toolset', default=win_toolset_default, type=str,
help='Use specified platform toolset version')
ap.add_argument(
- '-q', '--qtver', default='5.9.4',
+ '-q', '--qtver', default='5.15.0',
help='Sets the version of Qmake')
parsed_args = ap.parse_args()
@@ -244,7 +246,7 @@ def main():
parsed_args = parse_args()
if parsed_args.deps:
- deps(parsed_args.arch, parsed_args.toolset, parsed_args.qtver)
+ deps(parsed_args.arch, parsed_args.toolset)
if parsed_args.build:
build(parsed_args.arch, parsed_args.toolset, parsed_args.sdk,
--
GitLab