mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 551666 - Provide possibility to compile and render Qt port with QGLWidget backend. r=dougt
--HG-- extra : rebase_source : 00d53f71a00e71cf8b777779fc84ea45361256ea
This commit is contained in:
parent
393a53534c
commit
8672ed123f
@ -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"
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user