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 /src/tools/bootstrap-dbus/bootstrap-dbus.pro | |
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 'src/tools/bootstrap-dbus/bootstrap-dbus.pro')
-rw-r--r-- | src/tools/bootstrap-dbus/bootstrap-dbus.pro | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/tools/bootstrap-dbus/bootstrap-dbus.pro b/src/tools/bootstrap-dbus/bootstrap-dbus.pro index fb06b4d8a2..4c466ba0e9 100644 --- a/src/tools/bootstrap-dbus/bootstrap-dbus.pro +++ b/src/tools/bootstrap-dbus/bootstrap-dbus.pro @@ -2,16 +2,12 @@ option(host_build) MODULE = bootstrap_dbus TARGET = QtBootstrapDBus -CONFIG += no_module_headers internal_module force_bootstrap +CONFIG += minimal_syncqt internal_module force_bootstrap DEFINES += \ QT_NO_CAST_FROM_ASCII -MODULE_INCLUDES = \ - \$\$QT_MODULE_INCLUDE_BASE/QtDBus -MODULE_PRIVATE_INCLUDES = \ - \$\$QT_MODULE_INCLUDE_BASE/QtDBus/$$QT_VERSION \ - \$\$QT_MODULE_INCLUDE_BASE/QtDBus/$$QT_VERSION/QtDBus +MODULE_INCNAME = QtDBus load(qt_module) |