Kaydet (Commit) 588f1cca authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski

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: 's avatarJan-Marek Glogowski <glogow@fbihome.de>
üst 2b6bd096
...@@ -158,7 +158,7 @@ public: ...@@ -158,7 +158,7 @@ public:
virtual void SetPointer(PointerStyle ePointerStyle) override; virtual void SetPointer(PointerStyle ePointerStyle) override;
virtual void CaptureMouse(bool bMouse) override; virtual void CaptureMouse(bool bMouse) override;
virtual void SetPointerPos(long nX, long nY) 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; using SalFrame::Flush;
virtual void Flush() override; virtual void Flush() override;
virtual void SetInputContext(SalInputContext* pContext) override; virtual void SetInputContext(SalInputContext* pContext) override;
......
...@@ -60,7 +60,7 @@ class Qt5Widget : public QWidget ...@@ -60,7 +60,7 @@ class Qt5Widget : public QWidget
const QString m_InternalMimeType = "application/x-libreoffice-dnditem"; const QString m_InternalMimeType = "application/x-libreoffice-dnditem";
public slots: public slots:
void showTooltip(const OUString& rTip); static void showTooltip(const OUString& rTip);
public: public:
Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f = Qt::WindowFlags()); Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f = Qt::WindowFlags());
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
#include <Qt5Graphics.hxx> #include <Qt5Graphics.hxx>
#include <Qt5Tools.hxx> #include <Qt5Tools.hxx>
#include <QtCore/QtGlobal> #include <QtCore/QMimeData>
#include <QtGui/QDrag>
#include <QtGui/QFocusEvent> #include <QtGui/QFocusEvent>
#include <QtGui/QImage> #include <QtGui/QImage>
#include <QtGui/QKeyEvent> #include <QtGui/QKeyEvent>
...@@ -33,10 +34,10 @@ ...@@ -33,10 +34,10 @@
#include <QtGui/QPaintEvent> #include <QtGui/QPaintEvent>
#include <QtGui/QResizeEvent> #include <QtGui/QResizeEvent>
#include <QtGui/QShowEvent> #include <QtGui/QShowEvent>
#include <QtGui/QToolTip>
#include <QtGui/QWheelEvent> #include <QtGui/QWheelEvent>
#include <QtWidgets/QtWidgets>
#include <QtWidgets/QMainWindow> #include <QtWidgets/QMainWindow>
#include <QtWidgets/QToolTip>
#include <QtWidgets/QWidget>
#include <cairo.h> #include <cairo.h>
#include <headless/svpgdi.hxx> #include <headless/svpgdi.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment