| commit | 193f7b553e0ad41e6579adbce867ef14866034b0 | |
| author | Wladimir J. van der Laan <laanwj@gmail.com> | |
| Wed, 4 Nov 2015 15:42:51 +0000 (4 16:42 +0100) | ||
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | |
| Wed, 4 Nov 2015 15:43:12 +0000 (4 16:43 +0100) | ||
| tree | fb990b1282002709cb369cbcee6466eec45b1f65 | treesnapshot (tar.gz zip) |
| parent | c702521a85640d1972c982879efcb2cb0f897692 | commitdiff |
| parent | dbacc69b4f2e16841556a69f26ef9f6b81100100 | commitdiff |
Merge pull request #6938
dbacc69 build: If both Qt4 and Qt5 are installed, use Qt5 (Wladimir J. van der Laan)
dbacc69 build: If both Qt4 and Qt5 are installed, use Qt5 (Wladimir J. van der Laan)