Bug 1567888 - remove unneeded QT-related rules and configure bits; r=nalexander
authorNathan Froyd <froydnj@mozilla.com>
Mon, 22 Jul 2019 18:53:43 +0000
changeset 483743 27e67a486e5230b632702f1a81adff4c0a858e0a
parent 483742 242befc305f7a98d1d9ce2a402cca80b9c37b920
child 483744 72f73483711f529f98180c7b9157efba7cf9218b
push id113751
push usernerli@mozilla.com
push dateTue, 23 Jul 2019 16:03:30 +0000
treeherdermozilla-inbound@04e16e7d0432 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1567888
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
config/rules.mk
old-configure.in
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -724,31 +724,16 @@ crate_src_libdep = $(call mk_global_crat
 $(HOST_CMMOBJS):
 	$(REPORT_BUILD_VERBOSE)
 	$(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 
 $(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.
 $(ASOBJS):
 	$(REPORT_BUILD_VERBOSE)
 	$(AS) $(ASOUTOPTION)$@ $(ASFLAGS) $($(notdir $<)_FLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS)
 endif
 
--- a/old-configure.in
+++ b/old-configure.in
@@ -1843,19 +1843,16 @@ then
 
     TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS"
 fi
 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
 dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Components and Features)
 
 AC_SUBST(MOZ_OFFICIAL_BRANDING)