diff options
| author | BlackNoxis <steven.darklight@gmail.com> | 2015-05-31 15:31:15 +0300 |
|---|---|---|
| committer | BlackNoxis <steven.darklight@gmail.com> | 2015-05-31 15:31:15 +0300 |
| commit | 604043c7015fbe22fd52a2e1ae5cf69be2b5c020 (patch) | |
| tree | bfbf66cba19175442c2eca3a1f8e0ea3a023a6a3 | |
| parent | ad1fc3282ed67cf32c749a34860565c1d71e9aaa (diff) | |
| parent | 65e272e056fb25f8b9e90757c60b46aef9896838 (diff) | |
Merge remote-tracking branch 'venerix/master'
| -rw-r--r-- | app-admin/calamares/calamares-999.ebuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild index 31bc3140..a4ac0eef 100644 --- a/app-admin/calamares/calamares-999.ebuild +++ b/app-admin/calamares/calamares-999.ebuild @@ -52,6 +52,10 @@ RDEPEND=">=dev-qt/qtcore-5.4.0:5 virtual/udev[systemd]" src_prepare() { + # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used. + # Setting QT_SELECT environment variable will enforce correct binaries (fix taken from vlc ebuild) + export QT_SELECT=qt5 + git submodule init git submodule update } |