diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-15 18:15:22 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-18 15:52:39 +0100 |
| commit | 2e4ce301f98d3f463a7151c21dc8cc407cd8702c (patch) | |
| tree | 2933bb84e6ebd6bfeb43f0294a8888f71f0aedcd /mkspecs/features/unix | |
| parent | 9dcbfc1c44099d2d510163cf16bbb72e6ea42cae (diff) | |
take advantage of new safety regarding build config resolution
all tests that happen after default_post loads resolve_config can rely
on debug vs. release, static vs. shared, and staticlib vs. dll being
properly "de-conflicted".
Change-Id: Ie0b4defcd6024bd1c25f53ba7e03621052d96492
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/features/unix')
| -rw-r--r-- | mkspecs/features/unix/bsymbolic_functions.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/unix/gdb_dwarf_index.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/unix/separate_debug_info.prf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/unix/bsymbolic_functions.prf b/mkspecs/features/unix/bsymbolic_functions.prf index 5a60463e36..5fca5ac170 100644 --- a/mkspecs/features/unix/bsymbolic_functions.prf +++ b/mkspecs/features/unix/bsymbolic_functions.prf @@ -1,5 +1,5 @@ -!staticlib:!static:contains(TEMPLATE, lib) { +dll { QMAKE_LFLAGS_SHLIB += $$QMAKE_LFLAGS_BSYMBOLIC_FUNC !isEmpty(QMAKE_DYNAMIC_LIST_FILE):QMAKE_LFLAGS_SHLIB += $$QMAKE_LFLAGS_DYNAMIC_LIST$$QMAKE_DYNAMIC_LIST_FILE diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf index 9a7a8e01bc..0a5ee507ff 100644 --- a/mkspecs/features/unix/gdb_dwarf_index.prf +++ b/mkspecs/features/unix/gdb_dwarf_index.prf @@ -1,4 +1,4 @@ -!CONFIG(separate_debug_info):CONFIG(debug, debug|release):have_target:!staticlib:!static:!isEmpty(QMAKE_OBJCOPY) { +!separate_debug_info:have_target:debug:!static:!isEmpty(QMAKE_OBJCOPY) { contains(TEMPLATE, "lib") { QMAKE_GDB_INDEX = { test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\"; } && diff --git a/mkspecs/features/unix/separate_debug_info.prf b/mkspecs/features/unix/separate_debug_info.prf index 0e0f60e16e..cea1731888 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:!staticlib:!static:!isEmpty(QMAKE_OBJCOPY) { +!separate_debug_info_nocopy:have_target:!static:!isEmpty(QMAKE_OBJCOPY) { qnx:debug_info_suffix=sym else:debug_info_suffix=debug QMAKE_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; $$QMAKE_OBJCOPY --only-keep-debug \"\$\$targ\" \"\$\$targ.$$debug_info_suffix\" && $$QMAKE_OBJCOPY --strip-debug \"\$\$targ\" && $$QMAKE_OBJCOPY --add-gnu-debuglink=\"\$\$targ.$$debug_info_suffix\" \"\$\$targ\" && chmod -x \"\$\$targ.$$debug_info_suffix\" |