wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1165918 - Qt widget port does not compile anymore. r=rojkov

Browse Source
This commit is contained in:
Oleg Romashin 2015-05-18 18:13:56 -07:00
parent 4a3dbe7243
commit be0bc210b9
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -4478,7 +4478,7 @@ then
if test "$NS_PRINTING"; then if test "$NS_PRINTING"; then
PKG_CHECK_MODULES(MOZ_QT_WIDGETS, Qt5PrintSupport, , PKG_CHECK_MODULES(MOZ_QT_WIDGETS, Qt5PrintSupport, ,
[ [
AC_MSG_ERROR([$MOZ_QT_PKG_ERRORS Need qtbase widgets development package]) AC_MSG_ERROR([$MOZ_QT_PKG_ERRORS Need qt5 printsupport development package])
]) ])
MOZ_QT_LIBS="$MOZ_QT_LIBS $MOZ_QT_WIDGETS_LIBS" MOZ_QT_LIBS="$MOZ_QT_LIBS $MOZ_QT_WIDGETS_LIBS"
MOZ_QT_CFLAGS="$MOZ_QT_CFLAGS $MOZ_QT_WIDGETS_CFLAGS" MOZ_QT_CFLAGS="$MOZ_QT_CFLAGS $MOZ_QT_WIDGETS_CFLAGS"

2
dom/system/qt/QtHapticFeedback.h
View File

@ -10,4 +10,6 @@ class QtHapticFeedback : public nsIHapticFeedback
public: public:
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIHAPTICFEEDBACK NS_DECL_NSIHAPTICFEEDBACK
protected:
virtual ~QtHapticFeedback() {}
}; };

1
widget/qt/nsQtKeyUtils.cpp
View File

@ -445,7 +445,6 @@ QtKeyCodeToDOMKeyNameIndex(int aKeysym)
case Qt::Key_TouchpadOff: case Qt::Key_TouchpadOff:
case Qt::Key_unknown: case Qt::Key_unknown:
case Qt::Key_Call: case Qt::Key_Call:
case Qt::Key_CameraFocus:
case Qt::Key_Context1: case Qt::Key_Context1:
case Qt::Key_Context2: case Qt::Key_Context2:
case Qt::Key_Context3: case Qt::Key_Context3:

4
widget/qt/nsWindow.cpp
View File

@ -630,7 +630,7 @@ nsWindow::Invalidate(const nsIntRect &aRect)
LayoutDeviceIntPoint LayoutDeviceIntPoint
nsWindow::WidgetToScreenOffset() nsWindow::WidgetToScreenOffset()
{ {
NS_ENSURE_TRUE(mWidget, nsIntPoint(0,0)); NS_ENSURE_TRUE(mWidget, LayoutDeviceIntPoint(0,0));
QPoint origin(0, 0); QPoint origin(0, 0);
origin = mWidget->mapToGlobal(origin); origin = mWidget->mapToGlobal(origin);
@ -1505,7 +1505,7 @@ nsWindow::GetScreenBounds(nsIntRect &aRect)
aRect.MoveTo(pos.x(), pos.y()); aRect.MoveTo(pos.x(), pos.y());
} }
else { else {
aRect.MoveTo(WidgetToScreenOffset()); aRect.MoveTo(WidgetToScreenOffsetUntyped());
} }
LOG(("GetScreenBounds %d %d | %d %d | %d %d\n", LOG(("GetScreenBounds %d %d | %d %d | %d %d\n",
aRect.x, aRect.y, aRect.x, aRect.y,