Merge remote-tracking branch 'origin/5.3' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 14 Oct 2014 12:08:40 +0000 (14:08 +0200)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 14 Oct 2014 12:08:40 +0000 (14:08 +0200)
commite69d4a9fd917d332c490a50e98b9802183afc478
tree5ac0115bc62bb5f84baa3f2b1b35a75ffe702b7d
parentd55407822eefbc05f7d8bb44c53b057332b5b399
parenta1751e3d586f1ebfb1770392e52d7c1648a7406f
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
src/assistant/assistant/mainwindow.cpp
src/linguist/linguist/mainwindow.cpp
src/qdbus/qdbusviewer/qdbusviewer.cpp

Change-Id: I1f5524ab747be561ed0b13d8b1fd8cb51a890363
src/assistant/help/qhelpcontentwidget.cpp
src/assistant/help/qhelpenginecore.cpp
src/assistant/help/qhelpenginecore.h
src/assistant/help/qhelpindexwidget.cpp
src/macdeployqt/macdeployqt/main.cpp
src/macdeployqt/shared/shared.cpp
src/macdeployqt/shared/shared.h
src/qconfig/main.cpp