AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify qt rpath code

Browse Source 
the rpath applies only to the installed on-device location and is
consequently always the same for all modules, so there is no point in
indirections.

Change-Id: Ia0590552aa317d799a2d3879fd0c0768344b9645
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-06-04 21:20:25 +02:00
parent 61fcbed4de
commit e853edd657
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkspecs/features/qt.prf
View File

@ -59,6 +59,11 @@ qt_module_deps = $$QT $$QT_PRIVATE
qt_module_deps = $$replace(qt_module_deps, -private$, _private) qt_module_deps = $$replace(qt_module_deps, -private$, _private)
qt_module_deps = $$resolve_depends(qt_module_deps, "QT.") qt_module_deps = $$resolve_depends(qt_module_deps, "QT.")
!static:contains(QT_CONFIG, rpath):!contains(QT_CONFIG, static):!contains(QT_CONFIG, qt_framework):\
contains(qt_module_deps, core) {
QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS/dev]
}
# static builds: link qml import plugins into the app. # static builds: link qml import plugins into the app.
contains(qt_module_deps, qml): \ contains(qt_module_deps, qml): \
contains(QT_CONFIG, static):contains(TEMPLATE, .*app):!host_build:!no_import_scan { contains(QT_CONFIG, static):contains(TEMPLATE, .*app):!host_build:!no_import_scan {

5
mkspecs/features/qt_functions.prf
View File

@ -127,11 +127,6 @@ defineTest(qtAddModule) {
lib = $${MODULE_NAME}$${QT_LIBINFIX}$$qtPlatformTargetSuffix() lib = $${MODULE_NAME}$${QT_LIBINFIX}$$qtPlatformTargetSuffix()
LINKAGE += -l$$lib LINKAGE += -l$$lib
contains(QT_CONFIG, rpath) {
QMAKE_RPATHDIR *= $$eval(QT.$${1}.rpath)
export(QMAKE_RPATHDIR)
}
contains(MODULE_CONFIG, staticlib) { contains(MODULE_CONFIG, staticlib) {
PRE_TARGETDEPS *= $$MODULE_LIBS/$${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_STATICLIB} PRE_TARGETDEPS *= $$MODULE_LIBS/$${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_STATICLIB}
export(PRE_TARGETDEPS) export(PRE_TARGETDEPS)

10
mkspecs/features/qt_module_pris.prf
View File

@ -49,15 +49,6 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
module_libs = "\$\$QT_MODULE_HOST_LIB_BASE" module_libs = "\$\$QT_MODULE_HOST_LIB_BASE"
else: \ else: \
module_libs = "\$\$QT_MODULE_LIB_BASE" module_libs = "\$\$QT_MODULE_LIB_BASE"
unix:!static {
host_build: \
module_rpath = $$[QT_HOST_LIBS]
else: \
module_rpath = $$[QT_INSTALL_LIBS/dev]
module_rpath = "QT.$${MODULE_ID}.rpath = $$val_escape(module_rpath)"
} else {
module_rpath =
}
!isEmpty(QT_PRIVATE): \ !isEmpty(QT_PRIVATE): \
module_rundep = "QT.$${MODULE_ID}.run_depends = $$replace(QT_PRIVATE, -private$, _private)" module_rundep = "QT.$${MODULE_ID}.run_depends = $$replace(QT_PRIVATE, -private$, _private)"
else: \ else: \
@ -115,7 +106,6 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
"" \ "" \
"QT.$${MODULE_ID}.name = $$TARGET" \ "QT.$${MODULE_ID}.name = $$TARGET" \
"QT.$${MODULE_ID}.libs = $$module_libs" \ "QT.$${MODULE_ID}.libs = $$module_libs" \
$$module_rpath \
$$module_master \ $$module_master \
"QT.$${MODULE_ID}.includes = $$MODULE_INCLUDES" "QT.$${MODULE_ID}.includes = $$MODULE_INCLUDES"
!host_build: MODULE_PRI_CONT += \ !host_build: MODULE_PRI_CONT += \