Configure: Set separate_debug_info for all modules
separate_debug_info was previously stored in .qmake.cache, and therefore only affected qtbase. Store it as a QT_CONFIG setting instead, and add it to CONFIG for all Qt plugins and modules. Change-Id: I940c8cb30f1c42c85f4d0342e6a482f20677ff04 Reviewed-on: http://codereview.qt.nokia.com/2975 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>bb10
parent
0536ec05c3
commit
d6d3a32a68
|
|
@ -7113,10 +7113,10 @@ fi
|
|||
if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
|
||||
QMakeVar add QMAKE_CFLAGS -g
|
||||
QMakeVar add QMAKE_CXXFLAGS -g
|
||||
QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info"
|
||||
QT_CONFIG="$QT_CONFIG separate_debug_info"
|
||||
fi
|
||||
if [ "$CFG_SEPARATE_DEBUG_INFO_NOCOPY" = "yes" ] ; then
|
||||
QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info_nocopy"
|
||||
QT_CONFIG="$QT_CONFIG separate_debug_info_nocopy"
|
||||
fi
|
||||
[ "$CFG_MMX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG mmx"
|
||||
[ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
|
||||
|
|
|
|||
|
|
@ -59,6 +59,8 @@ linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
|
|||
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
||||
unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
|
||||
contains(QT_CONFIG, largefile):CONFIG += largefile
|
||||
contains(QT_CONFIG, separate_debug_info):CONFIG += separate_debug_info
|
||||
contains(QT_CONFIG, separate_debug_info_nocopy):CONFIG += separate_debug_info_nocopy
|
||||
|
||||
#mac frameworks
|
||||
mac:!static:contains(QT_CONFIG, qt_framework) {
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ CONFIG += qt plugin
|
|||
win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
|
||||
TARGET = $$qtLibraryTarget($$TARGET)
|
||||
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
||||
contains(QT_CONFIG, separate_debug_info):CONFIG += separate_debug_info
|
||||
contains(QT_CONFIG, separate_debug_info_nocopy):CONFIG += separate_debug_info_nocopy
|
||||
|
||||
load(qt_targets)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue