diff options
-rwxr-xr-x | configure | 7 | ||||
-rw-r--r-- | mkspecs/features/qt_common.prf | 1 | ||||
-rw-r--r-- | mkspecs/features/unix/separate_debug_info.prf | 2 |
3 files changed, 1 insertions, 9 deletions
@@ -671,7 +671,6 @@ CFG_LARGEFILE=auto CFG_OPENSSL=auto CFG_PRECOMPILE=auto CFG_SEPARATE_DEBUG_INFO=no -CFG_SEPARATE_DEBUG_INFO_NOCOPY=no CFG_REDUCE_EXPORTS=auto CFG_SSE2=auto CFG_SSE3=auto @@ -1493,9 +1492,6 @@ while [ "$#" -gt 0 ]; do separate-debug-info) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_SEPARATE_DEBUG_INFO="$VAL" - elif [ "$VAL" = "nocopy" ] ; then - CFG_SEPARATE_DEBUG_INFO="yes" - CFG_SEPARATE_DEBUG_INFO_NOCOPY="yes" else UNKNOWN_OPT=yes fi @@ -5839,9 +5835,6 @@ if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then QMakeVar add QMAKE_CXXFLAGS -g QT_CONFIG="$QT_CONFIG separate_debug_info" fi -if [ "$CFG_SEPARATE_DEBUG_INFO_NOCOPY" = "yes" ] ; then - QT_CONFIG="$QT_CONFIG separate_debug_info_nocopy" -fi [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2" [ "$CFG_SSE3" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse3" [ "$CFG_SSSE3" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG ssse3" diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index 051420e4f1..6cd848b405 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -19,7 +19,6 @@ contains(TEMPLATE, .*lib) { 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 } warnings_are_errors:warning_clean { diff --git a/mkspecs/features/unix/separate_debug_info.prf b/mkspecs/features/unix/separate_debug_info.prf index c5ff6dcba3..394d5f42bc 100644 --- a/mkspecs/features/unix/separate_debug_info.prf +++ b/mkspecs/features/unix/separate_debug_info.prf @@ -1,5 +1,5 @@ -!separate_debug_info_nocopy:have_target:!static:!isEmpty(QMAKE_OBJCOPY) { +have_target:!static:!isEmpty(QMAKE_OBJCOPY) { qnx { debug_info_suffix = sym debug_info_keep = --keep-file-symbols |