diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-19 10:00:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-19 10:03:01 +0100 |
| commit | 8f569c740a91b98365dcdaee2444038ce4957a76 (patch) | |
| tree | 749302d8bf9023ae51873a74dc641fd005744502 /mkspecs/features/qt_module.prf | |
| parent | 465e93aa95d99f799300867b07f81bdd5162c9f1 (diff) | |
| parent | e8ad49d6cba6521f20b1b08bf65d92fc81c158e4 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
config.tests/common/atomic64/atomic64.cpp
configure
src/3rdparty/forkfd/forkfd.c
src/corelib/io/forkfd_qt.cpp
src/widgets/kernel/qwidgetwindow.cpp
tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
tools/configure/configureapp.cpp
Change-Id: Ic6168d82e51a0ef1862c3a63bee6722e8f138414
Diffstat (limited to 'mkspecs/features/qt_module.prf')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index fdce486c00..e543ea65e6 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -139,6 +139,8 @@ mac { contains(QT_CONFIG, rpath): \ QMAKE_SONAME_PREFIX = @rpath + else: \ + CONFIG += absolute_library_soname } DEFINES += QT_BUILDING_QT |