commit: cd976c551901203f7f60c10325f88f250fb080d8
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 14:49:52 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 10 14:49:52 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cd976c55
[eclass] Sync.
eclass/qmake-utils.eclass | 28 ++++++++++++++++++++++++++++
eclass/qt4-build-multilib.eclass | 1 +
eclass/qt5-build.eclass | 1 +
3 files changed, 30 insertions(+)
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 725a5a5..ff8b352 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -28,6 +28,20 @@ qt4_get_bindir() {
fi
}
+# @FUNCTION: qt4_get_headerdir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 headers are installed.
+qt4_get_headerdir() {
+ echo ${EPREFIX}/usr/include/qt4
+}
+
+# @FUNCTION: qt4_get_mkspecsdir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 mkspecs are installed.
+qt4_get_mkspecsdir() {
+ echo ${EPREFIX}/usr/share/qt4/mkspecs
+}
+
# @FUNCTION: qt5_get_bindir
# @DESCRIPTION:
# Echoes the directory where Qt5 binaries are installed.
@@ -35,6 +49,20 @@ qt5_get_bindir() {
echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
}
+# @FUNCTION: qt5_get_headerdir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 headers are installed.
+qt5_get_headerdir() {
+ echo ${EPREFIX}/usr/include/qt5
+}
+
+# @FUNCTION: qt5_get_mkspecsdir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 mkspecs are installed.
+qt5_get_mkspecsdir() {
+ echo ${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs
+}
+
# @FUNCTION: qmake-utils_find_pro_file
# @RETURN: zero or one qmake .pro file names
# @INTERNAL
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 0fbe454..a244484 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -538,6 +538,7 @@ qt_native_use() {
# Prepares the environment for building Qt.
qt4_prepare_env() {
# setup installation directories
+ # note: keep paths in sync with qmake-utils.eclass
QT4_PREFIX=${EPREFIX}/usr
QT4_HEADERDIR=${QT4_PREFIX}/include/qt4
QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ea55dcf..f8c7674 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -389,6 +389,7 @@ qt_use_disable_mod() {
# Prepares the environment for building Qt.
qt5_prepare_env() {
# setup installation directories
+ # note: keep paths in sync with qmake-utils.eclass
QT5_PREFIX=${EPREFIX}/usr
QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)
