diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-15 18:15:14 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-18 14:53:01 +0100 |
| commit | 175cc28b9716f7f4f10eeee53fc541e556abe22e (patch) | |
| tree | eabe38f8e32bbdbcfbd64143668f1773a9ab5308 /lib | |
| parent | 5543e52d503f88bccf772160899ff01fe3df0583 (diff) | |
Remove the need for application to set an RPATH.
The WebEngineWidgets module and the WebEngine QtQuick plugin libraries
already have the RPATH set properly in their headers and the application
won't need to link any symbol directly to the Core library.
Remove the RPATH directive for examples and tests and fix the build issue
by making sure that the link directive isn't passed to dependencies
through the prl or pkgconfig file.
Change-Id: Id1f5efb8c9823613e804e8e6356d711d561d72ec
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/quick/quick.pro | 2 | ||||
| -rw-r--r-- | lib/widgets/widgets.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/quick/quick.pro b/lib/quick/quick.pro index 78650dedc..c4c248a41 100644 --- a/lib/quick/quick.pro +++ b/lib/quick/quick.pro @@ -14,7 +14,7 @@ INCLUDEPATH += ../ # FIXME: all this should eventually be turned into QT += webenginecore macx:LIBPATH = $$getOutDir()/$$getConfigDir() else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib -LIBS += -lQt5WebEngineCore -L$$LIBPATH +LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH QMAKE_RPATHDIR += $$LIBPATH #DESTDIR = $$LIBPATH diff --git a/lib/widgets/widgets.pro b/lib/widgets/widgets.pro index 60730f880..5da1be091 100644 --- a/lib/widgets/widgets.pro +++ b/lib/widgets/widgets.pro @@ -17,7 +17,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 += -L$$LIBPATH -lQt5WebEngineCore +LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH QMAKE_RPATHDIR += $$LIBPATH DESTDIR = $$LIBPATH |