From owner-freebsd-gecko@FreeBSD.ORG  Wed Mar 12 06:41:01 2014
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 926B284E
 for <freebsd-gecko@freebsd.org>; Wed, 12 Mar 2014 06:41:01 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.244.247])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 254BDD1C
 for <freebsd-gecko@freebsd.org>; Wed, 12 Mar 2014 06:41:00 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.244.247])
 by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s2C6ex41041542
 for <freebsd-gecko@freebsd.org>; Wed, 12 Mar 2014 06:40:59 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s2C6esU5040931
 for freebsd-gecko@freebsd.org; Wed, 12 Mar 2014 06:40:54 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Wed, 12 Mar 2014 06:40:54 GMT
Message-Id: <201403120640.s2C6esU5040931@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
 svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
Subject: [SVN-Commit] r1548 - in trunk: Mk www/firefox-nightly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko/>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Mar 2014 06:41:01 -0000

Author: jbeich
Date: Wed Mar 12 06:40:53 2014
New Revision: 1548

Log:
nightly doesn't support qt4 since bug 974335

Modified:
   trunk/Mk/bsd.gecko.mk
   trunk/www/firefox-nightly/Makefile

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Wed Mar 12 06:32:01 2014	(r1547)
+++ trunk/Mk/bsd.gecko.mk	Wed Mar 12 06:40:53 2014	(r1548)
@@ -668,7 +668,11 @@
 USE_MOZILLA+=	-cairo # ports/169343
 USE_DISPLAY=yes # install
 USE_GNOME+=	pango
+. if ${MOZILLA_VER:R:R} >= 30
+USE_QT5+=	qmake_build buildtools_build gui network quick printsupport
+. else
 USE_QT4+=	qmake_build moc_build rcc_build gui network opengl
+. endif
 MOZ_EXPORT+=	HOST_QMAKE="${QMAKE}" HOST_MOC="${MOC}" HOST_RCC="${RCC}"
 .elif ${MOZ_TOOLKIT:Mcairo-gtk3}
 USE_GNOME+=	gtk30

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Wed Mar 12 06:32:01 2014	(r1547)
+++ trunk/www/firefox-nightly/Makefile	Wed Mar 12 06:40:53 2014	(r1548)
@@ -43,7 +43,7 @@
 UNIQUENAME=	${MOZILLA}
 
 WANT_GNOME=	yes
-USE_QT4=	# empty
+USE_QT5=	# empty
 QT_NONSTANDARD=	yes
 ALL_TARGET=	default
 USE_BZIP2=	yes