Add using of MOZ_WIDGET_QT and other qt defines in various parts of mozilla tree
authorromaxa@romaxa.research.nokia.com
Sat, 19 Apr 2008 16:26:02 +0300
changeset 16760 5a8341256ca9d11157eb0a26b8b303d03426b76a
parent 16759 121613a0b6ffdd0b3ec069de3bc68aeff783f4ea
child 16761 1221f32ce4e8e6aa59513d9b2a02f5b418f36e66
push idunknown
push userunknown
push dateunknown
milestone2.0a1pre
Add using of MOZ_WIDGET_QT and other qt defines in various parts of mozilla tree
browser/themes/Makefile.in
toolkit/library/libxul-config.mk
toolkit/themes/Makefile.in
widget/src/Makefile.in
widget/src/xpwidgets/Makefile.in
xpfe/components/filepicker/Makefile.in
--- a/browser/themes/Makefile.in
+++ b/browser/themes/Makefile.in
@@ -50,13 +50,13 @@ include $(DEPTH)/config/autoconf.mk
 # MacOS X                 Pinstripe
 #
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 DIRS = pinstripe
 else
 DIRS = winstripe
 endif
-ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
 DIRS = gnomestripe
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -223,17 +223,17 @@ COMPONENT_LIBS += \
 ifdef MOZ_XPFE_COMPONENTS
 COMPONENT_LIBS += \
 	windowds \
 	intlapp \
 	$(NULL)
 endif
 endif
 
-ifeq (,$(filter beos os2 mac photon cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (,$(filter qt beos os2 mac photon cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 ifdef MOZ_XUL
 ifdef MOZ_XPFE_COMPONENTS
 COMPONENT_LIBS += fileview
 DEFINES += -DMOZ_FILEVIEW
 endif
 endif
 endif
 
--- a/toolkit/themes/Makefile.in
+++ b/toolkit/themes/Makefile.in
@@ -50,17 +50,17 @@ include $(DEPTH)/config/autoconf.mk
 #                         GNOMEStripe overrides (toolkit/themes/gnomestripe)
 # OS/2                    Winstripe (toolkit/themes/winstripe) + 
 #                         PMStripe overrides (toolkit/themes/pmstripe)
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 DIRS	= pinstripe
 else
 DIRS	= winstripe
-ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
 DIRS    += gnomestripe
 endif
 ifneq (,$(filter os2,$(MOZ_WIDGET_TOOLKIT)))
 DIRS    += pmstripe
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/widget/src/Makefile.in
+++ b/widget/src/Makefile.in
@@ -42,16 +42,18 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE  = widget
 
 PACKAGE_FILE = widget.pkg
 PACKAGE_VARS += \
 	MOZ_ENABLE_GTK2 \
+	MOZ_ENABLE_QT \
+	MOZ_ENABLE_XLIB \
 	MOZ_ENABLE_PHOTON \
 	MOZ_ENABLE_XREMOTE \
 	$(NULL)
 
 DIRS		= xpwidgets support
 
 ifneq (,$(filter beos os2 mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 DIRS		+= $(MOZ_WIDGET_TOOLKIT)
@@ -68,14 +70,18 @@ endif
 # multiple implementations of widget can be built on the same
 # source tree.
 #
 ifdef MOZ_ENABLE_GTK2
 DIRS		+= gtk2
 DIRS		+= gtkxtbin
 endif
 
+ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
+DIRS		+= qt
+endif
+
 ifdef MOZ_ENABLE_PHOTON
 DIRS		+= photon
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -82,22 +82,22 @@ CPPSRCS		= \
 		nsWidgetAtoms.cpp \
 		nsIdleService.cpp \
 		$(NULL)
 
 ifneq (,$(filter beos os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsBaseClipboard.cpp
 endif
 
-ifneq (,$(filter beos gtk2 os2 cocoa photon windows,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter beos qt gtk2 os2 cocoa photon windows,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsBaseFilePicker.cpp
 REQUIRES += docshell view intl
 endif
 
-ifneq (,$(filter gtk2 windows cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter qt gtk2 windows cocoa,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsNativeTheme.cpp
 endif
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) \
 		-I$(srcdir) \
 		$(NULL)
 
--- a/xpfe/components/filepicker/Makefile.in
+++ b/xpfe/components/filepicker/Makefile.in
@@ -42,15 +42,15 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= filepicker
 
 ifdef MOZ_XUL
-ifeq (,$(filter beos os2 mac photon cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (,$(filter qt beos os2 mac photon cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 DIRS = public src
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk