pesa 15/05/10 14:47:55
Modified: ChangeLog qmake-utils.eclass
Log:
Add qt{4,5}_get_{header,mkspecs}dir helper functions, bug 525830.
Revision Changes Path
1.1612 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1612&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1612&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1611&r2=1.1612
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1611
retrieving revision 1.1612
diff -u -r1.1611 -r1.1612
--- ChangeLog 10 May 2015 01:06:49 -0000 1.1611
+++ ChangeLog 10 May 2015 14:47:55 -0000 1.1612
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1611 2015/05/10
01:06:49 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1612 2015/05/10
14:47:55 pesa Exp $
+
+ 10 May 2015; Davide Pesavento <p...@gentoo.org> qmake-utils.eclass:
+ Add qt{4,5}_get_{header,mkspecs}dir helper functions, bug 525830.
10 May 2015; Davide Pesavento <p...@gentoo.org> qt4-build-multilib.eclass:
Delete obsolete code that is now causing problems on freebsd (bug 493310).
1.7 eclass/qmake-utils.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.6&r2=1.7
Index: qmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qmake-utils.eclass 26 Feb 2015 01:52:15 -0000 1.6
+++ qmake-utils.eclass 10 May 2015 14:47:55 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.6 2015/02/26
01:52:15 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.7 2015/05/10
14:47:55 pesa Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
@@ -28,6 +28,20 @@
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 @@
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
