diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2015-01-27 03:02:59 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-28 15:51:44 +0000 |
| commit | b1220f7f73ba78a11ba351dfec9852acb3e180ca (patch) | |
| tree | e3e938d8769f4fc88f51a38b09cef3f1a6d00d2d /src | |
| parent | a275e1c1d92f9499a6c98a6649f003c66b68c8eb (diff) | |
corelib: Fix a faulty 5.4->dev merge.
Commit b6191b16 ("Merge remote-tracking branch 'origin/5.4' into dev")
merged commit 350c60b ("Link against QMAKE_LIBS_EXECINFO when using
backtrace(3)") into the dev branch, but the conflict resolution left out
the actual line that changed LIBS_PRIVATE.
Change-Id: I6e716ed375abdc534a1f20e412ce7c56ee85d6c0
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/global.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 0b1374a3bb..bc11c77d88 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -36,6 +36,7 @@ INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global PRECOMPILED_HEADER = global/qt_pch.h # qlogging.cpp uses backtrace(3), which is in a separate library on the BSDs. +LIBS_PRIVATE += $$QMAKE_LIBS_EXECINFO if(linux*|hurd*):!cross_compile:!static:!*-armcc* { QMAKE_LFLAGS += -Wl,-e,qt_core_boilerplate |