зеркало из https://github.com/mozilla/pjs.git
Add using of MOZ_WIDGET_QT and other qt defines in various parts of mozilla tree
This commit is contained in:
Родитель
a18f3530df
Коммит
f06e80d4a1
|
@ -55,7 +55,7 @@ DIRS = pinstripe
|
|||
else
|
||||
DIRS = winstripe
|
||||
endif
|
||||
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
|
||||
ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
|
||||
DIRS = gnomestripe
|
||||
endif
|
||||
|
||||
|
|
|
@ -228,7 +228,7 @@ COMPONENT_LIBS += \
|
|||
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
|
||||
|
|
|
@ -55,7 +55,7 @@ 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)))
|
||||
|
|
|
@ -47,6 +47,8 @@ MODULE = widget
|
|||
PACKAGE_FILE = widget.pkg
|
||||
PACKAGE_VARS += \
|
||||
MOZ_ENABLE_GTK2 \
|
||||
MOZ_ENABLE_QT \
|
||||
MOZ_ENABLE_XLIB \
|
||||
MOZ_ENABLE_PHOTON \
|
||||
MOZ_ENABLE_XREMOTE \
|
||||
$(NULL)
|
||||
|
@ -73,6 +75,10 @@ DIRS += gtk2
|
|||
DIRS += gtkxtbin
|
||||
endif
|
||||
|
||||
ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
|
||||
DIRS += qt
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_PHOTON
|
||||
DIRS += photon
|
||||
endif
|
||||
|
|
|
@ -87,12 +87,12 @@ 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
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ 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
|
||||
|
|
Загрузка…
Ссылка в новой задаче