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

Don't try to build examples if RPATH isn't available


QMAKE_LFLAGS_RPATH is stripped from the mkspecs in official
Arch Linux Qt packages.

Don't force building examples in this case to allow qtwebengine to
build using the system Qt with a straight qmake;make.

Change-Id: Id406d55d34c0d313d69ba9f689f8f24f33038824
Reviewed-by: default avatarAndras Becsi <andras.becsi@digia.com>
Showing with 8 additions and 4 deletions
load(qt_build_config) load(qt_build_config)
# As long as we are a module separate from the rest of Qt, we want to unconditionally build examples. # Examples will only be able to find libQt5WebEngineCore.so if the proper RPATH was set on libQt5WebEngineWidgets.so
# Once part of Qt 5, this should be removed and we should respect the Qt wide configuration. # Arch Linux disables RPATH for security reasons.
QTWEBENGINE_BUILD_PARTS = $$QT_BUILD_PARTS !isEmpty($$QMAKE_LFLAGS_RPATH) {
QTWEBENGINE_BUILD_PARTS *= examples # As long as we are a module separate from the rest of Qt, we want to unconditionally build examples.
# Once part of Qt 5, this should be removed and we should respect the Qt wide configuration.
QTWEBENGINE_BUILD_PARTS = $$QT_BUILD_PARTS
QTWEBENGINE_BUILD_PARTS *= examples
}
load(qt_parts) load(qt_parts)
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