Skip to content
Snippets Groups Projects
Commit 14a1fd01 authored by Jenkins's avatar Jenkins
Browse files

submodules: update nightly branch

parents b584daae e98a5a26
No related branches found
Tags
No related merge requests found
client-gnome @ ce48f0c6
Subproject commit 9da6aa16c300dc19a4a115beb0033f52cf3a58d2 Subproject commit ce48f0c6c653a16ffcd759effd9ba9e5e2a36e6f
daemon @ d2ae07d3
Subproject commit 7eb1e7373d48fa4c23f142b0b70c09f437d22e36 Subproject commit d2ae07d329cbc578074da37a33c806d9a9845e8f
FROM opensuse/leap:15.2 FROM opensuse/leap:15.1
RUN zypper --non-interactive install dnf RUN zypper --non-interactive install dnf
RUN dnf clean all RUN dnf clean all
RUN zypper --non-interactive lr RUN zypper --non-interactive lr
......
lrc @ 2d3b1f01
Subproject commit 07f522570e21d008356a2f609fbe40eef383900a Subproject commit 2d3b1f017cbb824172a3b605af6efa453dd0edc9
...@@ -192,7 +192,7 @@ def run_powersell_cmd(cmd): ...@@ -192,7 +192,7 @@ def run_powersell_cmd(cmd):
def write_qt_conf(path): def write_qt_conf(path):
# Add a configuration that can be supplied to qmake # Add a configuration that can be supplied to qmake
# e.g. `qmake -qt=5.15 [mode] [options] [files]` # e.g. `qmake -qt=5.15 [mode] [options] [files]`
if path is '': if path == '':
return return
with open('/usr/share/qtchooser/' + QT5_VERSION + '.conf', 'w+') as fd: with open('/usr/share/qtchooser/' + QT5_VERSION + '.conf', 'w+') as fd:
fd.write(path.rstrip('/') + '/bin\n') fd.write(path.rstrip('/') + '/bin\n')
...@@ -352,7 +352,7 @@ def run_install(args): ...@@ -352,7 +352,7 @@ def run_install(args):
else: else:
install_args += ("-c", "client-qt") install_args += ("-c", "client-qt")
install_args += ("-q", QT5_VERSION) install_args += ("-q", QT5_VERSION)
if args.qt is '': if args.qt == '':
install_args += ("-Q", DEFAULT_QT_PATH) install_args += ("-Q", DEFAULT_QT_PATH)
else: else:
install_args += ("-Q", args.qt) install_args += ("-Q", args.qt)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment