diff --git a/configure.in b/configure.in
index 7168b9cd94b..e6c197f5d03 100644
--- a/configure.in
+++ b/configure.in
@@ -4478,7 +4478,7 @@ then
             if test "$NS_PRINTING"; then
                 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_CFLAGS="$MOZ_QT_CFLAGS $MOZ_QT_WIDGETS_CFLAGS"
diff --git a/dom/system/qt/QtHapticFeedback.h b/dom/system/qt/QtHapticFeedback.h
index 3e6dbb6bd16..64fff752695 100644
--- a/dom/system/qt/QtHapticFeedback.h
+++ b/dom/system/qt/QtHapticFeedback.h
@@ -10,4 +10,6 @@ class QtHapticFeedback : public nsIHapticFeedback
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIHAPTICFEEDBACK
+protected:
+  virtual ~QtHapticFeedback() {}
 };
diff --git a/widget/qt/nsQtKeyUtils.cpp b/widget/qt/nsQtKeyUtils.cpp
index fbcf7c5bbd8..931075f5a12 100644
--- a/widget/qt/nsQtKeyUtils.cpp
+++ b/widget/qt/nsQtKeyUtils.cpp
@@ -445,7 +445,6 @@ QtKeyCodeToDOMKeyNameIndex(int aKeysym)
         case Qt::Key_TouchpadOff:
         case Qt::Key_unknown:
         case Qt::Key_Call:
-        case Qt::Key_CameraFocus:
         case Qt::Key_Context1:
         case Qt::Key_Context2:
         case Qt::Key_Context3:
diff --git a/widget/qt/nsWindow.cpp b/widget/qt/nsWindow.cpp
index 4e040b76d00..79faa263605 100644
--- a/widget/qt/nsWindow.cpp
+++ b/widget/qt/nsWindow.cpp
@@ -630,7 +630,7 @@ nsWindow::Invalidate(const nsIntRect &aRect)
 LayoutDeviceIntPoint
 nsWindow::WidgetToScreenOffset()
 {
-    NS_ENSURE_TRUE(mWidget, nsIntPoint(0,0));
+    NS_ENSURE_TRUE(mWidget, LayoutDeviceIntPoint(0,0));
 
     QPoint origin(0, 0);
     origin = mWidget->mapToGlobal(origin);
@@ -1505,7 +1505,7 @@ nsWindow::GetScreenBounds(nsIntRect &aRect)
         aRect.MoveTo(pos.x(), pos.y());
     }
     else {
-        aRect.MoveTo(WidgetToScreenOffset());
+        aRect.MoveTo(WidgetToScreenOffsetUntyped());
     }
     LOG(("GetScreenBounds %d %d | %d %d | %d %d\n",
          aRect.x, aRect.y,