Stop setting QTDIR. It's only relevant when building qt itself, and in any case qmake...
authorDavide Pesavento <pesa@gentoo.org>
Mon, 17 Nov 2014 02:15:42 +0000 (02:15 +0000)
committerDavide Pesavento <pesa@gentoo.org>
Mon, 17 Nov 2014 02:15:42 +0000 (02:15 +0000)
eclass/ChangeLog
eclass/qmake-utils.eclass

index 59b4f1112c734d095f1e4a7b7b31f3444e9979b0..c9f1a3e92ff939a88817108d0c07af9e31a94179 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1424 2014/11/17 00:24:43 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1425 2014/11/17 02:15:42 pesa Exp $
+
+  17 Nov 2014; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass:
+  Stop setting QTDIR. It's only relevant when building qt itself, and in any
+  case qmake doesn't use it.
 
   17 Nov 2014; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
   Add blocker on emul-linux-x86-qtlibs wrt bug 529370.
index da8cba24d837ea0eff12eff228961807eedcf652..dac5b244e63bedcdb98738697a926d664f94bf17 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.4 2014/11/01 23:39:05 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.5 2014/11/17 02:15:42 pesa Exp $
 
 # @ECLASS: qmake-utils.eclass
 # @MAINTAINER:
@@ -164,7 +164,6 @@ eqmake4() {
 
        "${qmake_path}" \
                -makefile \
-               QTDIR="${EPREFIX}"/usr/$(get_libdir) \
                QMAKE_AR="$(tc-getAR) cqs" \
                QMAKE_CC="$(tc-getCC)" \
                QMAKE_CXX="$(tc-getCXX)" \