diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 41323 -> 41325 bytes | |||
| -rw-r--r-- | eclass/qt4-build-multilib.eclass | 2 | ||||
| -rw-r--r-- | eclass/qt5-build.eclass | 6 |
3 files changed, 4 insertions, 4 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex d6a25e3b0b67..bdb0c8887e87 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 4fcef72da16f..869d200ff11f 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -478,8 +478,6 @@ qt4_multilib_src_install() { # convenience symlinks dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/4.conf dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/qt4.conf - # TODO bug 522646: write an eselect module to manage default.conf - dosym qt4.conf /etc/xdg/qtchooser/default.conf fi fi diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 939a048d3d42..b664edb611bd 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -325,6 +325,8 @@ qt5-build_src_install() { # convenience symlinks dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf + # TODO bug 522646: write an eselect module to manage default.conf + dosym qt5.conf /etc/xdg/qtchooser/default.conf fi qt5_install_module_config @@ -844,8 +846,8 @@ qt5_install_module_config() { # install also the original qconfig.pri [[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]] && ( insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo - newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri - newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qmodule.pri qmodule-qtcore.pri + newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qconfig.pri qconfig-qtcore.pri + newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qmodule.pri qmodule-qtcore.pri ) } |