diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
| commit | 158a3a4159bdc5a49caecd63e021dacbc06cf23c (patch) | |
| tree | c3ed9aee6cabd46e5e8615b3815b92d32857c4da /mkspecs/features/qt_module.prf | |
| parent | 26ece94a68fb5ae680c5639716b06c4e1ae979a8 (diff) | |
| parent | 7b2fb038ae4b8b9231ae989ad309b6eca107a858 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qiodevice_p.h
src/corelib/kernel/qvariant_p.h
src/corelib/tools/qsimd.cpp
src/gui/kernel/qguiapplication.cpp
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a
Diffstat (limited to 'mkspecs/features/qt_module.prf')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 6ed75a4416..e543ea65e6 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -80,10 +80,10 @@ CONFIG += qmake_cache target_qt QMAKE_DOCS_TARGETDIR = qt$${MODULE} -load(qt_module_pris) load(qt_common) - !no_module_headers: load(qt_module_headers) +load(qt_module_pris) + INCLUDEPATH *= $$eval(QT.$${MODULE}.includes) $$eval(QT.$${MODULE}_private.includes) # If Qt was configured with -debug-and-release then build the module the same way @@ -139,6 +139,8 @@ mac { contains(QT_CONFIG, rpath): \ QMAKE_SONAME_PREFIX = @rpath + else: \ + CONFIG += absolute_library_soname } DEFINES += QT_BUILDING_QT |