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 /examples | |
| 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 'examples')
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/quick/quicknanobrowser/quicknanobrowser.pro b/examples/quick/quicknanobrowser/quicknanobrowser.pro index 2132b031a..aae724c55 100644 --- a/examples/quick/quicknanobrowser/quicknanobrowser.pro +++ b/examples/quick/quicknanobrowser/quicknanobrowser.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = quicknanobrowser -include($$QTWEBENGINE_ROOT/common.pri) +macx: CONFIG -= app_bundle HEADERS = quickwindow.h SOURCES = quickwindow.cpp main.cpp diff --git a/examples/widgets/browser/browser.pro b/examples/widgets/browser/browser.pro index e19efafb1..c63602412 100644 --- a/examples/widgets/browser/browser.pro +++ b/examples/widgets/browser/browser.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = browser QT += webenginewidgets network widgets printsupport -include($$QTWEBENGINE_ROOT/common.pri) +macx: CONFIG -= app_bundle qtHaveModule(uitools):!embedded: QT += uitools else: DEFINES += QT_NO_UITOOLS diff --git a/examples/widgets/fancybrowser/fancybrowser.pro b/examples/widgets/fancybrowser/fancybrowser.pro index 01f7c535a..eb5e5a34c 100644 --- a/examples/widgets/fancybrowser/fancybrowser.pro +++ b/examples/widgets/fancybrowser/fancybrowser.pro @@ -1,6 +1,6 @@ QT += webenginewidgets -include($$QTWEBENGINE_ROOT/common.pri) +macx: CONFIG -= app_bundle HEADERS = mainwindow.h SOURCES = main.cpp \ diff --git a/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro b/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro index bd9e53a90..c79d314c2 100644 --- a/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro +++ b/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = widgetsnanobrowser -include($$QTWEBENGINE_ROOT/common.pri) +macx: CONFIG -= app_bundle HEADERS = widgetwindow.h SOURCES = widgetwindow.cpp main.cpp |