[Libreoffice-commits] core.git: vcl/inc vcl/qt5

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Frame.hxx  |    2 +-
 vcl/inc/qt5/Qt5Widget.hxx |    2 +-
 vcl/qt5/Qt5Widget.cxx     |    7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 588f1cca15462a28fff7d983cdd991f2a96d1ca0
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Wed Dec 12 12:33:26 2018 +0000
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Wed Dec 12 16:34:50 2018 +0100

    Qt5 fix the clang plugin build
    
    ... and fix the global Qt* and wrong included headers.
    
    Change-Id: I436628d3a2d4469d5cc72f9fe7f394426d86fb2e
    Reviewed-on: https://gerrit.libreoffice.org/65023
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 86f22e9d95eb..4ed3d7a2060a 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -158,7 +158,7 @@ public:
     virtual void SetPointer(PointerStyle ePointerStyle) override;
     virtual void CaptureMouse(bool bMouse) override;
     virtual void SetPointerPos(long nX, long nY) override;
-    virtual bool ShowTooltip(const OUString& rText, const tools::Rectangle& rHelpArea);
+    virtual bool ShowTooltip(const OUString& rText, const tools::Rectangle& rHelpArea) override;
     using SalFrame::Flush;
     virtual void Flush() override;
     virtual void SetInputContext(SalInputContext* pContext) override;
diff --git a/vcl/inc/qt5/Qt5Widget.hxx b/vcl/inc/qt5/Qt5Widget.hxx
index ce68e1892c8c..ad043650b32e 100644
--- a/vcl/inc/qt5/Qt5Widget.hxx
+++ b/vcl/inc/qt5/Qt5Widget.hxx
@@ -60,7 +60,7 @@ class Qt5Widget : public QWidget
     const QString m_InternalMimeType = "application/x-libreoffice-dnditem";
 
 public slots:
-    void showTooltip(const OUString& rTip);
+    static void showTooltip(const OUString& rTip);
 
 public:
     Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f = Qt::WindowFlags());
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 373977693e0a..ba839a6abaea 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -24,7 +24,8 @@
 #include <Qt5Graphics.hxx>
 #include <Qt5Tools.hxx>
 
-#include <QtCore/QtGlobal>
+#include <QtCore/QMimeData>
+#include <QtGui/QDrag>
 #include <QtGui/QFocusEvent>
 #include <QtGui/QImage>
 #include <QtGui/QKeyEvent>
@@ -33,10 +34,10 @@
 #include <QtGui/QPaintEvent>
 #include <QtGui/QResizeEvent>
 #include <QtGui/QShowEvent>
-#include <QtGui/QToolTip>
 #include <QtGui/QWheelEvent>
-#include <QtWidgets/QtWidgets>
 #include <QtWidgets/QMainWindow>
+#include <QtWidgets/QToolTip>
+#include <QtWidgets/QWidget>
 
 #include <cairo.h>
 #include <headless/svpgdi.hxx>