From c27638c4bd0418e4888effeee495f30cfa91a158 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Mon, 22 Jul 2019 18:53:43 +0000
Subject: [PATCH] Bug 1567888 - remove unneeded QT-related rules and configure
 bits; r=nalexander

We needed these rules and bits for the QT widget port, but there's no
longer a QT port in the tree, so we might as well remove them.

Differential Revision: https://phabricator.services.mozilla.com/D38886

--HG--
extra : moz-landing-system : lando
---
 config/rules.mk  | 15 ---------------
 old-configure.in |  3 ---
 2 files changed, 18 deletions(-)

diff --git a/config/rules.mk b/config/rules.mk
index 62c550a272dc..ca583715b042 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -729,21 +729,6 @@ $(COBJS):
 	$(REPORT_BUILD_VERBOSE)
 	$(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $($(notdir $<)_FLAGS) $(_VPATH_SRCS)
 
-# DEFINES and ACDEFINES are needed here to enable conditional compilation of Q_OBJECTs:
-# 'moc' only knows about #defines it gets on the command line (-D...), not in
-# included headers like mozilla-config.h
-$(filter moc_%.cpp,$(CPPSRCS)): moc_%.cpp: %.h
-	$(REPORT_BUILD_VERBOSE)
-	$(MOC) $(DEFINES) $(ACDEFINES) $< $(OUTOPTION)$@
-
-$(filter moc_%.cc,$(CPPSRCS)): moc_%.cc: %.cc
-	$(REPORT_BUILD_VERBOSE)
-	$(MOC) $(DEFINES) $(ACDEFINES) $(_VPATH_SRCS:.cc=.h) $(OUTOPTION)$@
-
-$(filter qrc_%.cpp,$(CPPSRCS)): qrc_%.cpp: %.qrc
-	$(REPORT_BUILD_VERBOSE)
-	$(RCC) -name $* $< $(OUTOPTION)$@
-
 ifdef ASFILES
 # The AS_DASH_C_FLAG is needed cause not all assemblers (Solaris) accept
 # a '-c' flag.
diff --git a/old-configure.in b/old-configure.in
index fc6cdafac437..7918afc66f34 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1848,9 +1848,6 @@ AC_SUBST(MOZ_ENABLE_STARTUP_NOTIFICATION)
 AC_SUBST_LIST(TK_CFLAGS)
 AC_SUBST_LIST(TK_LIBS)
 
-AC_SUBST(MOC)
-AC_SUBST(RCC)
-
 dnl ========================================================
 dnl =
 dnl = Components & Features