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 /tests | |
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 'tests')
-rw-r--r-- | tests/auto/quick/tests.pri | 2 | ||||
-rw-r--r-- | tests/auto/widgets/tests.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/tests.pri b/tests/auto/quick/tests.pri index 618ffe0cd..bdefa9159 100644 --- a/tests/auto/quick/tests.pri +++ b/tests/auto/quick/tests.pri @@ -12,7 +12,7 @@ INCLUDEPATH += \ QT += testlib network quick QT_PRIVATE += quick-private gui-private core-private -include($$QTWEBENGINE_ROOT/common.pri) +macx: CONFIG -= app_bundle # This define is used by some tests to look up resources in the source tree DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\" diff --git a/tests/auto/widgets/tests.pri b/tests/auto/widgets/tests.pri index 3d3979986..4ca22969f 100644 --- a/tests/auto/widgets/tests.pri +++ b/tests/auto/widgets/tests.pri @@ -18,7 +18,7 @@ INCLUDEPATH += \ $$PWD/../Api QT += testlib network webenginewidgets widgets -include($$QTWEBENGINE_ROOT/common.pri) +macx: CONFIG -= app_bundle # This define is used by some tests to look up resources in the source tree DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\" |