diff --git a/configure.in b/configure.in
index 2f23b4738a1..d55697f2489 100644
--- a/configure.in
+++ b/configure.in
@@ -5084,10 +5084,10 @@ then
     [ QTDIR=$withval])
 
     if test -z "$QTDIR"; then
-        PKG_CHECK_MODULES(MOZ_QT, QtGui QtNetwork QtCore)
+        PKG_CHECK_MODULES(MOZ_QT, QtGui QtNetwork QtCore QtOpenGL)
         AC_CHECK_PROGS(HOST_MOC, moc, "")
     else
-        MOZ_QT_LIBS="-L$QTDIR/lib/ -lQtGui -lQtNetwork -lQtCore -lQtDBus -lQtXml"
+        MOZ_QT_LIBS="-L$QTDIR/lib/ -lQtGui -lQtNetwork -lQtCore -lQtDBus -lQtXml -lQtOpenGL"
 
         MOZ_QT_CFLAGS="-DQT_SHARED"
         MOZ_QT_CFLAGS="$MOZ_QT_CFLAGS -I$QTDIR/include"
diff --git a/widget/src/qt/mozqwidget.h b/widget/src/qt/mozqwidget.h
index 48839529f21..a4a4ba764d1 100644
--- a/widget/src/qt/mozqwidget.h
+++ b/widget/src/qt/mozqwidget.h
@@ -4,8 +4,10 @@
 #include <QtGui/QApplication>
 #include <QtGui/QGraphicsView>
 #include <QtGui/QGraphicsWidget>
+#include <QtOpenGL/QGLWidget>
 
 #include "nsIWidget.h"
+#include "prenv.h"
 
 class QEvent;
 class QPixmap;
@@ -147,6 +149,8 @@ public:
      : QGraphicsView (new QGraphicsScene(), aParent)
      , mEventHandler(this, aTopLevel)
     {
+        if (PR_GetEnv("MOZ_QT_GL"))
+            setViewport(new QGLWidget());
         scene()->addItem(aTopLevel);
     }