diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 09:02:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 09:02:57 +0100 |
| commit | 6cb8121a44ee0f94f2c9fcb075d1d3c802d8c5c7 (patch) | |
| tree | 25822898b71068f820d25a9e8372dfb348190ec1 /src/gui/kernel/qshapedpixmapdndwindow_p.h | |
| parent | 96740193e1e0f0608f67660811a44b696924ad4c (diff) | |
| parent | 2e02de165115c9d67ac343ff0960ed80f9c09bc8 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/widgets/styles/qgtkstyle_p.cpp
tests/auto/corelib/io/qtextstream/test/test.pro
tests/auto/corelib/plugin/plugin.pro
Change-Id: I512bc1b36acf3933ed2b96c00f476ee3819c1f4b
Diffstat (limited to 'src/gui/kernel/qshapedpixmapdndwindow_p.h')
| -rw-r--r-- | src/gui/kernel/qshapedpixmapdndwindow_p.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/gui/kernel/qshapedpixmapdndwindow_p.h b/src/gui/kernel/qshapedpixmapdndwindow_p.h index 65a4e3cfa7..21cecba9e8 100644 --- a/src/gui/kernel/qshapedpixmapdndwindow_p.h +++ b/src/gui/kernel/qshapedpixmapdndwindow_p.h @@ -51,21 +51,18 @@ // We mean it. // -#include <QtGui/QWindow> +#include <QtGui/QRasterWindow> #include <QtGui/QPixmap> -#include <QtGui/QBackingStore> QT_BEGIN_NAMESPACE -class QShapedPixmapWindow : public QWindow +class QShapedPixmapWindow : public QRasterWindow { Q_OBJECT public: explicit QShapedPixmapWindow(QScreen *screen = 0); ~QShapedPixmapWindow(); - void render(); - void setUseCompositing(bool on) { m_useCompositing = on; } void setPixmap(const QPixmap &pixmap); void setHotspot(const QPoint &hotspot); @@ -73,10 +70,9 @@ public: void updateGeometry(const QPoint &pos); protected: - void exposeEvent(QExposeEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; private: - QBackingStore *m_backingStore; QPixmap m_pixmap; QPoint m_hotSpot; bool m_useCompositing; |