From 96d987edac0bbbb1a02382eae3389d75b655406b Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Thu, 11 Aug 2011 11:53:10 +1000 Subject: Let CONFIG+=no_default_target also disable `check' by default If the compilation of a subdir was explicitly disabled by default, then the testing of that subdir should also be disabled by default. Change-Id: I928e232393e89a7c27813b7a48864d4e0fb687f8 Reviewed-on: http://codereview.qt.nokia.com/2835 Reviewed-by: Qt Sanity Bot Reviewed-by: Kalle Lehtonen --- mkspecs/features/default_post.prf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'mkspecs/features') diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index 3f93220cc4..b16492b324 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -99,10 +99,16 @@ QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST # Let every project have a standard GNU `check' target !contains(QMAKE_EXTRA_TARGETS, check) { # `make check' should iterate through all subdirs + # (except those with no_default_target) contains(TEMPLATE, subdirs) { check.CONFIG = recursive - check.recurse = $$SUBDIRS check.recurse_target = check + + for(subdir, SUBDIRS) { + subdir_config=$$eval($${subdir}.CONFIG) + !contains(subdir_config, no_default_target):check.recurse += $$subdir + unset(subdir_config) + } } # `make check' should imply building the project else { -- cgit v1.2.3 From d6d3a32a688da08fd0eab74c9b142e34a7676d17 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 15 Aug 2011 15:36:08 +0200 Subject: 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 Reviewed-by: Oswald Buddenhagen Reviewed-by: Marius Storm-Olsen --- mkspecs/features/qt_module_config.prf | 2 ++ mkspecs/features/qt_plugin.prf | 2 ++ 2 files changed, 4 insertions(+) (limited to 'mkspecs/features') diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 7b5b5ad304..e110de0c5b 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -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) { diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index c4eaab8147..824729ba52 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -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) -- cgit v1.2.3