diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-12 12:51:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-12 21:13:56 +0100 |
| commit | c2d188f225a96ccf409f4dbebd19f6e59caf7da6 (patch) | |
| tree | 35d0320171ad60a4e25c41f0718d02016dfd4242 /coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh | |
| parent | ab25cb7af6602a558c84e3d30e8ce1c6e7ca6e73 (diff) | |
| parent | 19872ea84352182ee974ff84d2e3872a21427117 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh')
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh index 6f0f3797..7f24d224 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh @@ -35,4 +35,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/qnx_700.sh" +source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" |