Commit 175cc28b authored by Jocelyn Turcotte's avatar Jocelyn Turcotte Committed by The Qt Project
Browse files

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: default avatarAndras Becsi <andras.becsi@digia.com>
Showing with 8 additions and 16 deletions
macx:LIBPATH = $$getOutDir()/$$getConfigDir()
else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib
macx: CONFIG -= app_bundle
# Allows examples/tests to link to libQt5WebEngineCore which
# isn't deployed properly yet.
QMAKE_RPATHDIR += $$LIBPATH
TEMPLATE = app TEMPLATE = app
TARGET = quicknanobrowser TARGET = quicknanobrowser
include($$QTWEBENGINE_ROOT/common.pri) macx: CONFIG -= app_bundle
HEADERS = quickwindow.h HEADERS = quickwindow.h
SOURCES = quickwindow.cpp main.cpp SOURCES = quickwindow.cpp main.cpp
......
...@@ -2,7 +2,7 @@ TEMPLATE = app ...@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = browser TARGET = browser
QT += webenginewidgets network widgets printsupport QT += webenginewidgets network widgets printsupport
include($$QTWEBENGINE_ROOT/common.pri) macx: CONFIG -= app_bundle
qtHaveModule(uitools):!embedded: QT += uitools qtHaveModule(uitools):!embedded: QT += uitools
else: DEFINES += QT_NO_UITOOLS else: DEFINES += QT_NO_UITOOLS
......
QT += webenginewidgets QT += webenginewidgets
include($$QTWEBENGINE_ROOT/common.pri) macx: CONFIG -= app_bundle
HEADERS = mainwindow.h HEADERS = mainwindow.h
SOURCES = main.cpp \ SOURCES = main.cpp \
......
TEMPLATE = app TEMPLATE = app
TARGET = widgetsnanobrowser TARGET = widgetsnanobrowser
include($$QTWEBENGINE_ROOT/common.pri) macx: CONFIG -= app_bundle
HEADERS = widgetwindow.h HEADERS = widgetwindow.h
SOURCES = widgetwindow.cpp main.cpp SOURCES = widgetwindow.cpp main.cpp
......
...@@ -14,7 +14,7 @@ INCLUDEPATH += ../ ...@@ -14,7 +14,7 @@ INCLUDEPATH += ../
# FIXME: all this should eventually be turned into QT += webenginecore # FIXME: all this should eventually be turned into QT += webenginecore
macx:LIBPATH = $$getOutDir()/$$getConfigDir() macx:LIBPATH = $$getOutDir()/$$getConfigDir()
else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib
LIBS += -lQt5WebEngineCore -L$$LIBPATH LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH
QMAKE_RPATHDIR += $$LIBPATH QMAKE_RPATHDIR += $$LIBPATH
#DESTDIR = $$LIBPATH #DESTDIR = $$LIBPATH
......
...@@ -17,7 +17,7 @@ QT_PRIVATE += widgets-private gui-private core-private ...@@ -17,7 +17,7 @@ QT_PRIVATE += widgets-private gui-private core-private
# FIXME: all this should eventually be turned into QT += webenginecore # FIXME: all this should eventually be turned into QT += webenginecore
macx:LIBPATH = $$getOutDir()/$$getConfigDir() macx:LIBPATH = $$getOutDir()/$$getConfigDir()
else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib
LIBS += -L$$LIBPATH -lQt5WebEngineCore LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH
QMAKE_RPATHDIR += $$LIBPATH QMAKE_RPATHDIR += $$LIBPATH
DESTDIR = $$LIBPATH DESTDIR = $$LIBPATH
......
...@@ -12,7 +12,7 @@ INCLUDEPATH += \ ...@@ -12,7 +12,7 @@ INCLUDEPATH += \
QT += testlib network quick QT += testlib network quick
QT_PRIVATE += quick-private gui-private core-private 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 # This define is used by some tests to look up resources in the source tree
DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\" DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"
...@@ -18,7 +18,7 @@ INCLUDEPATH += \ ...@@ -18,7 +18,7 @@ INCLUDEPATH += \
$$PWD/../Api $$PWD/../Api
QT += testlib network webenginewidgets widgets 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 # This define is used by some tests to look up resources in the source tree
DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\" DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment