diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-10-10 16:43:21 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-10-16 10:02:09 +0300 |
commit | 2b58935efd12bd649e28149cb64ea021b88f9e2e (patch) | |
tree | 6c186f77c84ac4c87a517296e65bacce89b87e1a | |
parent | 72111504ea60b37e6b8e133e2d6b0d7029eeabec (diff) |
QNX: Use extprefix for the host path
Use extprefix instead of prefix, so that the target deployment
path won't contain host paths. Especially needed to avoid Windows
host paths on target. Prefix will default to /usr/local/Qt-x.x.x
Task-number: COIN-48
Change-Id: Ie888dace694294b72a32913b65a191b4bcb78371
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
-rw-r--r-- | coin/platform_configs/default.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/qt5.yaml | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 55e73038..d19ec84c 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -191,4 +191,4 @@ Configurations: Target arch: 'armv7' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 208c47ed..1bd4c9da 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -112,42 +112,42 @@ Target arch: 'x86' Compiler: 'GCC' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' - Template: 'qtci-windows-10-x86_64-14' Target os: 'QNX_700' Target arch: 'armv7' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' - Template: 'qtci-windows-10-x86_64-14' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' - Template: 'qtci-windows-10-x86_64-14' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' + Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' - Template: 'qtci-windows-10-x86_64-14' Target os: 'WebAssembly' |