Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Mon, 19 Jan 2015 13:07:29 +0000 (14:07 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Mon, 19 Jan 2015 13:07:29 +0000 (14:07 +0100)
commit6283d0c106e4caeaf25557864890745ab3fe6a3d
tree5d492389b1504dc6cafe4f218ade3fb7f07df3cb
parentdab033616c1c33b0f334ae86bef2a8d07ff4213a
parent9a00d1a01b1f7dc89ebe19adfa539af1fd1d3ecd
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
.qmake.conf

Change-Id: Ifdb0e36fde8a63e1a768f1c876521e908810244d
src/androiddeployqt/main.cpp
src/assistant/assistant/assistant.pro
src/assistant/assistant/main.cpp
src/qdbus/qdbusviewer/qdbusviewer.cpp
src/windeployqt/main.cpp