Bug 380196: Kill QT graphics code, p=sciguyryan, r/sr=roc

allmakefiles.sh

@@ -160,7 +160,6 @@ gfx/src/ps/Makefile
 gfx/src/psshared/Makefile
 gfx/src/photon/Makefile
 gfx/src/mac/Makefile
-gfx/src/qt/Makefile
 gfx/src/os2/Makefile
 gfx/src/xlibrgb/Makefile
 gfx/src/windows/Makefile
@@ -566,7 +565,6 @@ widget/src/Makefile
 widget/src/beos/Makefile
 widget/src/build/Makefile
 widget/src/gtkxtbin/Makefile
-widget/src/qt/Makefile
 widget/src/photon/Makefile
 widget/src/mac/Makefile
 widget/src/cocoa/Makefile
@@ -765,9 +763,6 @@ embedding/browser/webBrowser/Makefile
 embedding/browser/gtk/Makefile
 embedding/browser/gtk/src/Makefile
 embedding/browser/gtk/tests/Makefile
-embedding/browser/qt/Makefile
-embedding/browser/qt/src/Makefile
-embedding/browser/qt/tests/Makefile
 embedding/browser/photon/Makefile
 embedding/browser/photon/src/Makefile
 embedding/browser/photon/tests/Makefile

config/autoconf.mk.in

@@ -457,7 +457,6 @@ MOZ_ENABLE_CAIRO_GFX	= @MOZ_ENABLE_CAIRO_GFX@
 MOZ_ENABLE_CAIRO_FT	= @MOZ_ENABLE_CAIRO_FT@
 MOZ_ENABLE_GLITZ        = @MOZ_ENABLE_GLITZ@
 MOZ_ENABLE_GTK2		= @MOZ_ENABLE_GTK2@
-MOZ_ENABLE_QT		= @MOZ_ENABLE_QT@
 MOZ_ENABLE_PHOTON	= @MOZ_ENABLE_PHOTON@
 MOZ_ENABLE_COCOA	= @MOZ_ENABLE_COCOA@
 MOZ_ENABLE_XREMOTE	= @MOZ_ENABLE_XREMOTE@
@@ -469,9 +468,6 @@ MOZ_DBUS_GLIB_CFLAGS    = @MOZ_DBUS_GLIB_CFLAGS@
 MOZ_DBUS_GLIB_LIBS      = @MOZ_DBUS_GLIB_LIBS@
 MOZ_ENABLE_DBUS         = @MOZ_ENABLE_DBUS@
 
-MOZ_QT_CFLAGS		= @MOZ_QT_CFLAGS@
-MOZ_QT_LDFLAGS		= @MOZ_QT_LDFLAGS@
-
 MOZ_XPRINT_CFLAGS	= @MOZ_XPRINT_CFLAGS@
 MOZ_XPRINT_LDFLAGS	= @MOZ_XPRINT_LDFLAGS@
 MOZ_ENABLE_XPRINT	= @MOZ_ENABLE_XPRINT@
@@ -540,9 +536,6 @@ MOZ_PSM=@MOZ_PSM@
 GSSAPI_INCLUDES = @GSSAPI_INCLUDES@
 USE_GSSAPI	= @USE_GSSAPI@
 
-# for Qt build
-MOC=@MOC@
-
 MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@
 BUILD_OFFICIAL = @BUILD_OFFICIAL@
 MOZ_MILESTONE_RELEASE = @MOZ_MILESTONE_RELEASE@

config/rules.mk

@@ -303,10 +303,6 @@ ALL_TRASH = \
 ALL_TRASH_DIRS = \
 	$(GARBAGE_DIRS) /no-such-file
 
-ifdef QTDIR
-GARBAGE			+= $(MOCSRCS)
-endif
-
 ifdef SIMPLE_PROGRAMS
 GARBAGE			+= $(SIMPLE_PROGRAMS:%=%.$(OBJ_SUFFIX))
 endif

config/system-headers

@@ -559,62 +559,11 @@ Pt.h
 pthread.h
 pwd.h
 Python.h
-qaction.h
-qapplication.h
-qcheckbox.h
-qclipboard.h
-qcolor.h
-qcombobox.h
-qcstring.h
-qcursor.h
-qdesktopwidget.h
-qdir.h
 QDOffscreen.h
-qdragobject.h
-qevent.h
-qeventloop.h
-qfiledialog.h
-qfile.h
-qfontdatabase.h
-qfont.h
-qfontmetrics.h
-qhbox.h
-qimage.h
-qintdict.h
-qlabel.h
-qlayout.h
-qlineedit.h
-qmainwindow.h
-qmenubar.h
-qmessagebox.h
-qmetaobject.h
-qmime.h
-qobject.h
-qpaintdevicemetrics.h
-qpainter.h
-qpalette.h
-qpixmap.h
-qpopupmenu.h
-qpushbutton.h
-qregion.h
-qscrollbar.h
-qshared.h
-qsocketnotifier.h
-qstatusbar.h
-qstring.h
-qstringlist.h
-qstyle.h
-qtoolbar.h
-qtooltip.h
 Quickdraw.h
 QuickDraw.h
 QuickTimeComponents.h
 quipu/attr.h
-qvbox.h
-qwidget.h
-qwidgetlist.h
-qwidgetplugin.h
-qwindowdefs.h
 rasdlg.h
 raserror.h
 ras.h

configure.in

@@ -111,11 +111,8 @@ NSS_VERSION=3
 dnl Set the minimum version of toolkit libs used by mozilla
 dnl ========================================================
 GLIB_VERSION=1.2.0
-GTK_VERSION=1.2.0
 LIBIDL_VERSION=0.6.3
 PERL_VERSION=5.006
-QT_VERSION=3.2.0
-QT_VERSION_NUM=320
 LIBART_VERSION=2.3.4
 CAIRO_VERSION=1.4.2
 GLITZ_VERSION=0.4.0
@@ -4432,8 +4429,7 @@ MOZ_ARG_HEADER(Toolkit Options)
     [ _DEFAULT_TOOLKIT=$enableval ],
     [ _DEFAULT_TOOLKIT=$_PLATFORM_DEFAULT_TOOLKIT])
 
-    if test "$_DEFAULT_TOOLKIT" = "qt" \
+    if test "$_DEFAULT_TOOLKIT" = "photon" \
-        -o "$_DEFAULT_TOOLKIT" = "photon" \
         -o "$_DEFAULT_TOOLKIT" = "cairo-windows" \
         -o "$_DEFAULT_TOOLKIT" = "cairo-gtk2" \
         -o "$_DEFAULT_TOOLKIT" = "cairo-beos" \
@@ -4446,7 +4442,7 @@ MOZ_ARG_HEADER(Toolkit Options)
         MOZ_WIDGET_TOOLKIT=`echo "$_DEFAULT_TOOLKIT" | sed -e "s/,.*$//"`
     else
         if test "$no_x" != "yes"; then
-            AC_MSG_ERROR([Toolkit must be cairo-gtk2 or qt.])
+            AC_MSG_ERROR([Toolkit must be cairo-gtk2.])
         else
             AC_MSG_ERROR([Toolkit must be $_PLATFORM_DEFAULT_TOOLKIT (if supported).])
         fi
@@ -4459,17 +4455,6 @@ dnl = Enable the toolkit as needed                         =
 dnl ========================================================
 
 case "$MOZ_WIDGET_TOOLKIT" in
-qt)
-    MOZ_ENABLE_QT=1
-    if test "$_HAVE_FREETYPE2"; then
-        MOZ_ENABLE_FREETYPE2=1
-    fi
-    MOZ_ENABLE_XPRINT=1
-    TK_CFLAGS='$(MOZ_QT_CFLAGS)'
-    TK_LIBS='$(MOZ_QT_LDFLAGS)'
-    AC_DEFINE(MOZ_WIDGET_QT)
-    ;;
-
 photon)
 	MOZ_ENABLE_PHOTON=1
 	AC_DEFINE(MOZ_WIDGET_PHOTON)
@@ -4537,75 +4522,6 @@ if test "$MOZ_ENABLE_GTK2"
 then
     PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0)
 fi
-
-if test "$MOZ_ENABLE_QT"
-then
-    MOZ_ARG_WITH_STRING(qtdir,
-    [  --with-qtdir=\$dir       Specify Qt directory ],
-    [ QTDIR=$withval])
-
-    if test -z "$QTDIR"; then
-      QTDIR="/usr"
-    fi
-    QTINCDIR="/include/qt"
-    if test ! -d "$QTDIR$QTINCDIR"; then
-       QTINCDIR="/include/X11/qt"
-    fi
-    if test ! -d "$QTDIR$QTINCDIR"; then
-       QTINCDIR="/include"
-    fi
-
-    if test -x "$QTDIR/bin/moc"; then
-      HOST_MOC="$QTDIR/bin/moc"
-    else
-      AC_CHECK_PROGS(HOST_MOC, moc, "")
-    fi
-    if test -z "$HOST_MOC"; then
-      AC_MSG_ERROR([no acceptable moc preprocessor found])
-    fi
-    MOC=$HOST_MOC
-
-    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR -DQT_NO_STL"
-    if test -z "$MOZ_DEBUG"; then
-      QT_CFLAGS="$QT_CFLAGS -DQT_NO_DEBUG -DNO_DEBUG"
-    fi
-    _SAVE_LDFLAGS=$LDFLAGS
-    QT_LDFLAGS=-L${QTDIR}/lib
-    LDFLAGS="$LDFLAGS $QT_LDFLAGS"
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    AC_CHECK_LIB(qt, main, QT_LIB=-lqt,
-        AC_CHECK_LIB(qt-mt, main, QT_LIB=-lqt-mt,
-            AC_MSG_ERROR([Cannot find QT libraries.])))
-    LDFLAGS=$_SAVE_LDFLAGS
-    QT_LIBS="-L/usr/X11R6/lib $QT_LDFLAGS $QT_LIB -lXext -lX11"
-
-    MOZ_QT_LDFLAGS=$QT_LIBS
-    MOZ_QT_CFLAGS=$QT_CFLAGS
-
-    _SAVE_CXXFLAGS=$CXXFLAGS
-    _SAVE_LIBS=$LIBS
-
-    CXXFLAGS="$CXXFLAGS $QT_CFLAGS"
-    LIBS="$LIBS $QT_LIBS"
-    
-    AC_MSG_CHECKING(Qt - version >= $QT_VERSION)
-    AC_TRY_COMPILE([#include <qglobal.h>],
-    [
-        #if (QT_VERSION < $QT_VERSION_NUM)
-            #error  "QT_VERSION too old"
-        #endif
-    ],result="yes",result="no")
-
-    AC_MSG_RESULT("$result")
-    if test "$result" = "no"; then
-        AC_MSG_ERROR([Qt Mozilla requires at least version $QT_VERSION of Qt])
-    fi
-    CXXFLAGS=$_SAVE_CXXFLAGS
-    LIBS=$_SAVE_LIBS
-
-    AC_LANG_RESTORE
-fi
 fi # COMPILE_ENVIRONMENT
 
 AC_SUBST(MOZ_DEFAULT_TOOLKIT)
@@ -4650,7 +4566,6 @@ AC_SUBST(TK_CFLAGS)
 AC_SUBST(TK_LIBS)
 
 AC_SUBST(MOZ_ENABLE_GTK2)
-AC_SUBST(MOZ_ENABLE_QT)
 AC_SUBST(MOZ_ENABLE_PHOTON)
 AC_SUBST(MOZ_ENABLE_COCOA)
 AC_SUBST(MOZ_ENABLE_CAIRO_GFX)
@@ -4658,8 +4573,6 @@ AC_SUBST(MOZ_ENABLE_GLITZ)
 AC_SUBST(MOZ_ENABLE_XREMOTE)
 AC_SUBST(MOZ_GTK2_CFLAGS)
 AC_SUBST(MOZ_GTK2_LIBS)
-AC_SUBST(MOZ_QT_CFLAGS)
-AC_SUBST(MOZ_QT_LDFLAGS)
 
 AC_SUBST(MOC)
 
@@ -4669,8 +4582,7 @@ then
     AC_DEFINE(MOZ_CAIRO_GFX)
 fi
 
-if test "$MOZ_ENABLE_QT" \
+if test "$MOZ_ENABLE_GTK2"
-|| test "$MOZ_ENABLE_GTK2"
 then
     AC_DEFINE(MOZ_X11)
     MOZ_X11=1

embedding/components/build/Makefile.in

@@ -122,7 +122,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/os2 
 endif
 
-ifneq (,$(filter gtk2 beos photon qt, $(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter gtk2 beos photon, $(MOZ_WIDGET_TOOLKIT)))
 LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/unixshared 
 endif
 

embedding/components/printingui/src/Makefile.in

@@ -42,7 +42,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifneq (,$(filter gtk2 photon qt beos,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter gtk2 photon beos,$(MOZ_WIDGET_TOOLKIT)))
 PLATFORM_DIR += unixshared
 endif
 

gfx/src/Makefile.in

@@ -89,9 +89,6 @@ else
  ifdef MOZ_ENABLE_GTK2
  DIRS        += gtk
  endif
- ifdef MOZ_ENABLE_QT
- DIRS        += qt
- endif
  ifdef MOZ_ENABLE_PHOTON
  DIRS        += photon
  endif

layout/build/Makefile.in

@@ -248,7 +248,7 @@ EXTRA_DSO_LDOPTS += \
 endif
 
 # Add explicit X11 dependency when building against X11 toolkits
-ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
 endif
 

modules/plugin/base/src/Makefile.in

@@ -162,10 +162,3 @@ CXXFLAGS        += $(MOZ_GTK2_CFLAGS)
 CFLAGS          += $(MOZ_GTK2_CFLAGS)
 EXTRA_DSO_LDOPTS += -lgtkxtbin $(XLDFLAGS) $(XT_LIBS) $(MOZ_GTK2_LIBS) $(XLIBS)
 endif           #MOZ_ENABLE_GTK2
-
-ifdef MOZ_ENABLE_QT
-EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
-CXXFLAGS        += $(MOZ_QT_CFLAGS)
-CFLAGS          += $(MOZ_QT_CFLAGS)
-endif		#MOZ_ENABLE_QT
-

modules/plugin/base/src/nsPluginHostImpl.cpp

@@ -173,12 +173,8 @@
 #include "nsContentPolicyUtils.h"
 #include "nsContentErrors.h"
 
-#ifdef XP_UNIX
+#if defined(XP_UNIX) && defined(MOZ_WIDGET_GTK2)
-#if defined (MOZ_WIDGET_GTK2)
 #include <gdk/gdkx.h> // for GDK_DISPLAY()
-#elif defined(MOZ_WIDGET_QT)
-#include <qwindowdefs.h> // for qt_xdisplay()
-#endif
 #endif
 
 #ifdef XP_MACOSX
@@ -2635,8 +2631,6 @@ NS_IMETHODIMP nsPluginHostImpl::GetValue(nsPluginManagerVariable aVariable, void
     Display** value = NS_REINTERPRET_CAST(Display**, aValue);
 #if defined (MOZ_WIDGET_GTK2)
     *value = GDK_DISPLAY();
-#elif defined(MOZ_WIDGET_QT)
-    *value = qt_xdisplay();
 #endif
     if (!(*value)) {
       return NS_ERROR_FAILURE;

toolkit/components/remote/Makefile.in

@@ -56,8 +56,8 @@ REQUIRES = \
 	string \
 	appcomps \
 	toolkitcomps \
-        appshell \
+	appshell \
-        layout \
+	layout \
 	xulapp \
 	widget \
 	gfx \
@@ -83,7 +83,7 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(TK_LIBS)
 CXXFLAGS += $(TK_CFLAGS)
 
 # Add explicit X11 dependency when building against X11 toolkits
-ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
 endif
 

toolkit/library/Makefile.in

@@ -191,7 +191,7 @@ EXTRA_DSO_LDOPTS += \
 	$(NULL)
 endif
 
-ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS)
 endif
 

toolkit/library/libxul-config.mk

@@ -286,15 +286,9 @@ else # Platform-specific GFX layer
   ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
   COMPONENT_LIBS += gfx_mac
   endif
-  ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
-  COMPONENT_LIBS += widget_qt
-  endif
   ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
   COMPONENT_LIBS += gfx_gtk
   endif
-  ifdef MOZ_ENABLE_QT
-  COMPONENT_LIBS += gfx_qt
-  endif
   ifdef MOZ_ENABLE_PHOTON
   COMPONENT_LIBS += gfx_photon
   endif
@@ -312,9 +306,6 @@ endif
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 COMPONENT_LIBS += widget_mac
 endif
-ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
-COMPONENT_LIBS += widget_qt
-endif
 
 ifdef MOZ_ENABLE_PHOTON
 COMPONENT_LIBS += widget_photon

toolkit/library/nsStaticXULComponents.cpp

@@ -84,8 +84,6 @@
 #else
 #  if defined(MOZ_WIDGET_GTK2)
 #    define GFX_MODULES MODULE(nsGfxGTKModule)
-#  elif defined(MOZ_WIDGET_QT)
-#    define GFX_MODULES MODULE(nsGfxQtModule)
 #  elif defined(MOZ_WIDGET_PHOTON)
 #    define GFX_MODULES MODULE(nsGfxPhModule)
 #  elif defined(XP_WIN)
@@ -113,8 +111,6 @@
 #  define WIDGET_MODULES MODULE(nsWidgetGtk2Module)
 #elif defined(MOZ_WIDGET_PHOTON)
 #  define WIDGET_MODULES MODULE(nsWidgetPhModule)
-#elif defined(MOZ_WIDGET_QT)
-#  define WIDGET_MODULES MODULE(nsWidgetQtModule)
 #else
 #  error Unknown widget module.
 #endif

toolkit/xre/nsAppRunner.cpp

@@ -273,10 +273,6 @@ static char **gRestartArgv;
 #include "nsGTKToolkit.h"
 #endif
 
-#if defined(MOZ_WIDGET_QT)
-#include <qapplication.h>
-#endif
-
 // Save the path of the given file to the specified environment variable.
 static void
 SaveFileToEnv(const char *name, nsIFile *file)
@@ -2466,10 +2462,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
     gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
 #endif /* MOZ_WIDGET_GTK2 */
 
-#if defined(MOZ_WIDGET_QT)
-    QApplication qapp(argc, argv);
-#endif
-
     // Call the code to install our handler
 #ifdef MOZ_JPROF
     setupProfilingStuff();

widget/src/Makefile.in

@@ -73,10 +73,6 @@ DIRS		+= gtk2
 DIRS		+= gtkxtbin
 endif
 
-ifdef MOZ_ENABLE_QT
-DIRS		+= qt
-endif
-
 ifdef MOZ_ENABLE_PHOTON
 DIRS		+= photon
 endif

widget/src/os2/nsDeviceContextSpecOS2.cpp

@@ -262,26 +262,6 @@ NS_IMETHODIMP nsDeviceContextSpecOS2 :: QueryInterface(REFNSIID aIID, void** aIn
 NS_IMPL_ADDREF(nsDeviceContextSpecOS2)
 NS_IMPL_RELEASE(nsDeviceContextSpecOS2)
 
-  
-/** -------------------------------------------------------
- *  Initialize the nsDeviceContextSpecOS2
- *  @update   dc 2/15/98
- *  @update   syd 3/2/99
- *
- * gisburn: Please note that this function exists as 1:1 copy in other
- * toolkits including:
- * - GTK+-toolkit:
- *   file:     mozilla/gfx/src/gtk/nsDeviceContextSpecG.cpp
- *   function: NS_IMETHODIMP nsDeviceContextSpecGTK::Init(PRBool aPrintPreview )
- * - Xlib-toolkit: 
- *   file:     mozilla/gfx/src/xlib/nsDeviceContextSpecXlib.cpp 
- *   function: NS_IMETHODIMP nsDeviceContextSpecXlib::Init(PRBool aPrintPreview )
- * - Qt-toolkit:
- *   file:     mozilla/gfx/src/qt/nsDeviceContextSpecQT.cpp
- *   function: NS_IMETHODIMP nsDeviceContextSpecQT::Init(PRBool aPrintPreview )
- * 
- * ** Please update the other toolkits when changing this function.
- */
 NS_IMETHODIMP nsDeviceContextSpecOS2::Init(nsIWidget *aWidget,
                                            nsIPrintSettings* aPS,
                                            PRBool aIsPrintPreview)