diff options
| author | Arvid Nilsson <anilsson@blackberry.com> | 2013-11-27 11:55:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-27 14:19:39 +0100 |
| commit | 37001e62ca6492c719237e87c8642cb95eff8c01 (patch) | |
| tree | aece31d107e62b0cc1fb0f518ba9c07713b0fcc4 | |
| parent | 1a621393218f5b3e7c57e5b2539119d035168dca (diff) | |
Fix examples/widgets linking problems on QNX
Since QNX ld only supports staging-relative rpath values, the absolute
filesystem rpath stored in libQt5WebEngineWidgets.so doesn't help it
find libQtWebEngineCore.so.
As a QNX-specific counterpart to the rpath hack, we add an rpath-link
to qt_lib_webengine.pri that will allow webenginewidgets apps to find
the lib at link time.
Change-Id: I8217805edebebe55c66e47d6e9409c20f1dfc717
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | lib/widgets/widgets.pro | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/widgets/widgets.pro b/lib/widgets/widgets.pro index 0eb48ada5..3338e0cf7 100644 --- a/lib/widgets/widgets.pro +++ b/lib/widgets/widgets.pro @@ -37,3 +37,11 @@ HEADERS = \ render_widget_host_view_qt_delegate_widget.h load(qt_module) + +# QNX ld only supports staging-relative rpath values and can't use the rpath specified above. +# Instead, append an appropriate rpath-link to lib_qt_webenginewidgets.pri. +qnx:!build_pass { + local_build_rpath_link = "QMAKE_RPATHLINKDIR += $$LIBPATH" + # MODULE_PRI is defined in qt_module_pris.prf + write_file($$MODULE_PRI, local_build_rpath_link, append) +} |