Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Thu, 27 Aug 2015 20:20:34 +0000 (20:20 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 27 Aug 2015 22:29:28 +0000 (22:29 +0000)
commit6d51697f1d4a5b1d0d57efca29a8d81a591567bd
treeb4cc5ab53bf3e8ce4c1ce02106f17df0bd8699e6
parent3fe645ecc9aaf4522183c39f5c9a78ebc1c90674
parentafab1546a7665bac2a8d7a6452e6aea46bfd2127
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
src/corelib/global/qnamespace.qdoc
src/widgets/kernel/qapplication.cpp