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)
commit100ee69ddd32467ccf8b17af2fbbfb43a71b31a3
treea616dc0c5ab1b083d686638c1160d7535d876a8b
parent2608c7007e03737b1f5e1108fc1efc2b40f87aae
parentd45d6ca9da83d38bf2b7ca41820d533818161168
Merge pull request #4923 from RobinGeuze/2.2

Fix Qt4 build