Merge remote-tracking branch 'origin/5.4' into 5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 17 Mar 2015 08:49:02 +0000 (09:49 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 17 Mar 2015 08:49:02 +0000 (09:49 +0100)
commitf0094cfe36ab30e3f067d8826b3ee6101455d2b8
tree436b3e0281fd6dd7834f8afa5e03533bc9a24a3a
parent642bff09076a95b0eede67216a13b0080a2ce851
parent7f5b11a4a6357d2969e5b24bfb25c47aeb3d99f5
Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I5a49f9e755d85ea160fcf2ccfbc691ce0c17b458
src/assistant/assistant/bookmarkmanagerwidget.cpp
src/assistant/assistant/bookmarkmodel.cpp
src/assistant/assistant/xbelsupport.cpp
src/designer/src/designer/doc/src/designer-manual.qdoc
src/kmap2qmap/main.cpp
src/linguist/lrelease/lrelease.1
src/linguist/lupdate/cpp.cpp
src/linguist/lupdate/lupdate.1
src/linguist/lupdate/qdeclarative.cpp
tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp