mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-04-29 19:54:49 +02:00
misc: bump daemon
Brings in some build fixes. Also prevents applying the qmsetup patch on Windows, and calls build-windows.py --init with the qt parameter which is required if when using Qt installed in a non-standard location. Change-Id: I40facbdc93289792130a15b0f4151f78137bc1ef
This commit is contained in:
parent
c323dcfe13
commit
31581db7f5
2 changed files with 4 additions and 2 deletions
|
@ -98,7 +98,9 @@ endif()
|
|||
# then call find_package again. Unfortunately, even the second call to find_package sometimes
|
||||
# fails due to qmsetup having been installed in the wrong directory. The following patch
|
||||
# ensures that qmsetup is always installed in the directory where find_package looks for it.
|
||||
list(APPEND QWINDOWKIT_PATCHES ${EXTRA_PATCHES_DIR}/0001-fix-qm_install_package-function.patch)
|
||||
if(NOT WIN32)
|
||||
list(APPEND QWINDOWKIT_PATCHES ${EXTRA_PATCHES_DIR}/0001-fix-qm_install_package-function.patch)
|
||||
endif()
|
||||
|
||||
# qwindowkit (frameless window)
|
||||
add_fetch_content(
|
||||
|
|
2
build.py
2
build.py
|
@ -374,7 +374,7 @@ def run_install(args):
|
|||
# Prepare the build-windows.py script call
|
||||
build_windows = 'extras/scripts/build-windows.py'
|
||||
# Initialize build environment
|
||||
execute_script([f'python {build_windows} --init'])
|
||||
execute_script([f'python {build_windows} --init --qt={args.qt}'])
|
||||
|
||||
# Construct build command with options
|
||||
build_cmd = [
|
||||
|
|
Loading…
Add table
Reference in a new issue