diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:43:08 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:44:48 +0100 |
| commit | 351a519340d509300c754d0a62771a7f6e38ea4c (patch) | |
| tree | d7181ebd455c7081f682bd0c82a988f25e0aa446 /coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | |
| parent | 3c3d56c0cc3107a0b1d110bc1b61ee2f3cd05a90 (diff) | |
| parent | 485244b016172445aa20bd31fb84fec6b7724cf5 (diff) | |
Merge remote-tracking branch 'origin/5.10.1' into 5.10
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I218ce5567da7ea383009dca2c04beb974511dfcc
Diffstat (limited to 'coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh')
| -rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index f419b7c1..4ebc1b44 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -3,7 +3,7 @@ set -ex BASEDIR=$(dirname "$0") -source $BASEDIR/../common/network_test_server_ip.txt +source $BASEDIR/../common/shared/network_test_server_ip.txt source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc |