Bug 451263 - Implement moz-icon for Qt port. r=vladimir.

configure.in

@@ -5654,8 +5654,8 @@ case "$MOZ_WIDGET_TOOLKIT" in
 beos|windows|os2|mac|cocoa)
     ;;
 *)
-    if test -z "$MOZ_ENABLE_GTK2"; then
-       MOZ_IMG_DECODERS_DEFAULT=`echo $MOZ_IMG_DECODERS_DEFAULT | sed -e 's|icon||'`                
+    if test -z "$MOZ_ENABLE_GTK2" && test -z "$MOZ_ENABLE_QT"; then
+       MOZ_IMG_DECODERS_DEFAULT=`echo $MOZ_IMG_DECODERS_DEFAULT | sed -e 's|icon||'`
     fi
     ;;
 esac

modules/libpr0n/decoders/Makefile.in

@@ -46,6 +46,9 @@ ifneq (,$(filter icon,$(MOZ_IMG_DECODERS)))
 ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
 TOOL_DIRS = icon/gtk icon
 endif
+ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
+DIRS = icon/qt icon
+endif
 ifeq ($(OS_ARCH),WINNT)
 DIRS = icon/win icon
 endif

modules/libpr0n/decoders/icon/Makefile.in

@@ -58,6 +58,11 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 endif
 
+ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
+EXTRA_DSO_LDOPTS = $(MOZ_QT_LIBS)
+PLATFORM = qt
+endif
+
 ifeq ($(OS_ARCH),WINNT)
 EXTRA_DSO_LIBS = gkgfx
 PLATFORM = win
@@ -89,7 +94,7 @@ CPPSRCS		= \
 		nsIconProtocolHandler.cpp \
 		$(NULL)
 
-ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT)))
 USE_ICON_DECODER = 1
 endif
 ifeq (,$(filter-out Darwin OS2 BeOS,$(OS_ARCH)))