Merge pull request #4923 from RobinGeuze/2.2
authorDaniel Molkentin <daniel@molkentin.de>
Mon, 30 May 2016 09:50:50 +0000 (11:50 +0200)
committerDaniel Molkentin <daniel@molkentin.de>
Mon, 30 May 2016 09:50:50 +0000 (11:50 +0200)
Fix Qt4 build


Trivial merge