diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-02-04 17:12:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-05 15:51:30 +0100 |
| commit | 5a304a9adb834afc946c949cf8538a4f8b5d7cdd (patch) | |
| tree | d97b5d3e34d926c9d05c57d310dd41e3dfd4a754 /src/webenginewidgets/webenginewidgets.pro | |
| parent | ecaab295f96e3d12fc952c49d35a6eb32f72aba1 (diff) | |
Fix the embedded build
Adopt to toolchain changes and fix the build with the
current snapshot.
This patch adds some missing overrides and build system
configurations.
Change-Id: I488929500347bdb5a077ac14e9553cedfcaa605d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webenginewidgets/webenginewidgets.pro')
| -rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index a78efaa6c..a683998af 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro @@ -15,7 +15,7 @@ QT_PRIVATE += widgets-private gui-private core-private # FIXME: all this should eventually be turned into QT += webenginecore macx:LIBPATH = $$getOutDir()/$$getConfigDir() else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib -LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH +LIBS_PRIVATE += -L$$LIBPATH -lQt5WebEngineCore QMAKE_RPATHDIR += $$LIBPATH DESTDIR = $$LIBPATH @@ -38,9 +38,10 @@ HEADERS = \ load(qt_module) -# QNX ld only supports staging-relative rpath values and can't use the rpath specified above. +# Some binutils versions configured for cross compilation only support +# sysroot-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 { +cross_compile:!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) |