Parts of bug 288370 - mac libxul (xulrunner) build on mac, r=darin, plus making it more likely that libxul will build on QT (should not affect non-xulrunner)

toolkit/library/Makefile.in

@@ -193,6 +193,9 @@ endif
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 COMPONENT_LIBS += gfx_mac widget_mac
 endif
+ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
+COMPONENT_LIBS += widget_qt
+endif
 
 ifdef MOZ_ENABLE_CAIRO_GFX
 DEFINES += -DMOZ_ENABLE_CAIRO_GFX
@@ -236,8 +239,6 @@ SHARED_LIBRARY_LIBS = \
 	$(foreach component,$(COMPONENT_LIBS),$(DIST)/lib/components/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \
 	$(NULL)
 
-include $(topsrcdir)/config/rules.mk
-
 EXTRA_DSO_LDOPTS += \
 	$(JPEG_LIBS) \
 	$(PNG_LIBS) \
@@ -259,6 +260,8 @@ EXTRA_DSO_LIBS += macmorefiles_s
 EXTRA_DEPS += $(DIST)/lib/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
 endif
 
+include $(topsrcdir)/config/rules.mk
+
 EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS)
 
 OS_LIBS += $(LIBICONV)
@@ -279,7 +282,12 @@ EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 CXXFLAGS	+= $(TK_CFLAGS)
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
+EXTRA_DSO_LDOPTS += \
+	-framework Cocoa \
+	-framework QuickTime \
+	-framework IOKit \
+	$(TK_LIBS) \
+	$(NULL)
 endif
 
 ifdef MOZ_ENABLE_XINERAMA

toolkit/library/nsStaticXULComponents.cpp

@@ -121,6 +121,9 @@
 #ifdef MOZ_WIDGET_PHOTON
 #define WIDGET_MODULES MODULE(nsWidgetPhModule)
 #endif
+#ifdef MOZ_WIDGET_QT
+#define WIDGET_MODULES MODULE(nsWidgetQtModule)
+#endif
 
 #ifdef MOZ_ENABLE_XPRINT
 #define XPRINT_MODULES MODULE(nsGfxXprintModule)