diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-04-19 12:05:19 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-04-20 10:06:38 +0000 |
| commit | 5c4576ac2c25cc51e55f59dddd5ea3c790379ad9 (patch) | |
| tree | 90ad12262271ba515a3a868a8d75bd0a018526ca /packaging-tools/build_wrapper.py | |
| parent | 61cec3904a378ac5984322e23966d624a8459c9a (diff) | |
Qt Creator/qdoc: Add rpath to qdoc on macOS directly
When we modify the qdoc_wrapper script, this can be overwritten
again when we call 'make docs', so instead directly 'fix' qdoc itself.
Change-Id: Ic2363180aac98d269082a17af8aca589b83b0d48
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'packaging-tools/build_wrapper.py')
| -rw-r--r-- | packaging-tools/build_wrapper.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index 3c01eb2da..0d62b3d31 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -761,11 +761,11 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins): download_packages_work.addTaskObject(bldinstallercommon.create_download_extract_task( opt_clang_url, opt_clang_path, download_temp, None)) - # TODO temporary workaround for qdoc not finding a suitable libclang in the system QTBUG-66015 - qdoc_clang_extract_path = os.path.join(download_temp, 'libclang-qdoc') - qdoc_clang_url = ('http://download.qt.io/development_releases/prebuilt/libclang/libclang-release_40-' + optionDict['QTC_PLATFORM'] + '.7z') - download_packages_work.addTaskObject(bldinstallercommon.create_download_extract_task(qdoc_clang_url, qdoc_clang_extract_path, download_temp, None)) - build_environment['QDOC_LLVM_INSTALL_DIR'] = os.path.join(qdoc_clang_extract_path, 'libclang') + # TODO temporary workaround for qdoc not finding a suitable libclang in the system QTBUG-66015 + qdoc_clang_extract_path = os.path.join(download_temp, 'libclang-qdoc') + qdoc_clang_url = ('http://download.qt.io/development_releases/prebuilt/libclang/libclang-release_40-' + optionDict['QTC_PLATFORM'] + '.7z') + download_packages_work.addTaskObject(bldinstallercommon.create_download_extract_task(qdoc_clang_url, qdoc_clang_extract_path, download_temp, None)) + build_environment['QDOC_LLVM_INSTALL_DIR'] = os.path.join(qdoc_clang_extract_path, 'libclang') if elfutils_url: elfutils_path = os.path.join(download_temp, 'elfutils') |