Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Mon, 16 Feb 2015 14:23:22 +0000 (15:23 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Mon, 16 Feb 2015 14:23:22 +0000 (15:23 +0100)
commitb60fd7ade323e04da02d6ffd235272d19fa7076d
tree8310cef559521c4bebf640c3e275a354f675c4b8
parent95907799089ef34a0250bddfa1c5d6027ee996b8
parent638c278b76c56a51f83ef8c5cc9c03f18a887f74
Merge remote-tracking branch 'origin/5.4' into dev

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: Icd2e3843fbf9906454e8e3aa3ac46b21bae3c306
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