diff options
author | Liang Qi <liang.qi@qt.io> | 2020-04-24 15:31:01 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-04-24 15:31:01 +0200 |
commit | cc4fdea014287bb2c2b7dfe55104c2d620026da5 (patch) | |
tree | fd04d83477596ad43e514cd3f8f1cfbb477d0aea /coin/provisioning/qtci-macos-10.13-x86_64 | |
parent | 285f2c5690290e49313ccf8b76402c30acabbb5e (diff) | |
parent | ac8b28db576356431a1a414b2c08b2eb09c8b898 (diff) | |
download | qt5-cc4fdea014287bb2c2b7dfe55104c2d620026da5.tar.gz |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.gitmodules
coin/platform_configs/qt5.yaml
coin/platform_configs/qtsdk.yaml
coin/platform_configs/tqtc-qt-rta.yaml
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Change-Id: I2221262edc024e0aa11b9dab4d08c2df3a0b53b0
Diffstat (limited to 'coin/provisioning/qtci-macos-10.13-x86_64')
-rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/01-disable-notifications_and_warnings.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-disable-notifications_and_warnings.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-disable-notifications_and_warnings.sh new file mode 100755 index 00000000..27efbb62 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-disable-notifications_and_warnings.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/disable-notifications_and_warnings.sh |