lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-07-23 08:55:26 +02:00
Code Activity

misc: default build with Qt 5.15.0

Browse source 
Qt 5.15.0 is currently the minumum build version.

Change-Id: I05273b4addf530aae046934c59eeec8811562558
Gitlab: #581
This commit is contained in:
Andreas Traczyk 2020-08-13 12:55:47 -04:00
parent df651a2486
commit b1465cf480
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
copy-runtime-files.ps1
View file

@ -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"

8
make-client.py
View file

@ -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,