Merge remote-tracking branch 'origin/5.4' into 5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 20 Feb 2015 14:59:14 +0000 (15:59 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 20 Feb 2015 14:59:14 +0000 (15:59 +0100)
commit85e94c254a7205ac3e64379f34ca312a6b702234
tree8e47330b59ed5c7a2c04c41ad508ed5469d5349b
parentd1e639a800a105f4611c87f024664559c7d33aaa
parent638c278b76c56a51f83ef8c5cc9c03f18a887f74
Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
LICENSE.LGPLv21
LICENSE.LGPLv3
src/assistant/assistant/mainwindow.cpp
src/designer/src/designer/versiondialog.cpp
src/linguist/linguist/mainwindow.cpp
src/linguist/lrelease/lrelease.1
src/linguist/lupdate/lupdate.1
src/qconfig/main.cpp
src/qdbus/qdbusviewer/mainwindow.cpp

Change-Id: I8644f68ff02f00a377f82ea0b7520aa308f0a0df
src/androiddeployqt/main.cpp
src/assistant/assistant/mainwindow.cpp
src/designer/src/designer/versiondialog.cpp
src/designer/src/lib/sdk/abstractformwindow.cpp
src/linguist/linguist/mainwindow.cpp
src/linguist/lupdate/main.cpp
src/linguist/shared/po.cpp
src/macdeployqt/macdeployqt/main.cpp
src/macdeployqt/shared/shared.cpp
src/qdbus/qdbusviewer/mainwindow.cpp
src/qtdiag/qtdiag.cpp