diff options
author | Olli Werwolff <qt-info@nokia.com> | 2011-07-12 13:02:54 +0200 |
---|---|---|
committer | Oliver Wolff <oliver.wolff@nokia.com> | 2011-07-12 14:15:35 +0200 |
commit | 992ef929dff21e079f7d8a207c07dbfd0c3c8f78 (patch) | |
tree | 32c286aff3e501e704e02dc114228da5d032d5df /src/gui | |
parent | 54ec6d177e0e8fb04cd01e70461484a80ca1f7a4 (diff) |
Use PlatformNativeInterface to obtain backingStore's dc
Change-Id: I6ec2fc0b8e7696fdfe4468920228df2d21c933fd
Reviewed-on: http://codereview.qt.nokia.com/1501
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/kernel/qplatformnativeinterface_qpa.cpp | 7 | ||||
-rw-r--r-- | src/gui/kernel/qplatformnativeinterface_qpa.h | 2 | ||||
-rw-r--r-- | src/gui/painting/qbackingstore.cpp | 5 | ||||
-rw-r--r-- | src/gui/painting/qbackingstore.h | 3 |
4 files changed, 17 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface_qpa.cpp index 82d6a97a47..18bef8a595 100644 --- a/src/gui/kernel/qplatformnativeinterface_qpa.cpp +++ b/src/gui/kernel/qplatformnativeinterface_qpa.cpp @@ -57,4 +57,11 @@ void *QPlatformNativeInterface::nativeResourceForContext(const QByteArray &resou return 0; } +void * QPlatformNativeInterface::nativeResourceForBackingStore(const QByteArray &resource, QBackingStore *backingStore) +{ + Q_UNUSED(resource); + Q_UNUSED(backingStore); + return 0; +} + QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.h b/src/gui/kernel/qplatformnativeinterface_qpa.h index edc1a9d96e..136191e2aa 100644 --- a/src/gui/kernel/qplatformnativeinterface_qpa.h +++ b/src/gui/kernel/qplatformnativeinterface_qpa.h @@ -52,12 +52,14 @@ QT_MODULE(Gui) class QGuiGLContext; class QWindow; +class QBackingStore; class Q_GUI_EXPORT QPlatformNativeInterface { public: virtual void *nativeResourceForContext(const QByteArray &resource, QGuiGLContext *context); virtual void *nativeResourceForWindow(const QByteArray &resource, QWindow *window); + virtual void *nativeResourceForBackingStore(const QByteArray &resource, QBackingStore *backingStore); }; QT_END_NAMESPACE diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index 776e33a1a8..68dbb7d109 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -247,4 +247,9 @@ void Q_GUI_EXPORT qt_scrollRectInImage(QImage &img, const QRect &rect, const QPo } } +QPlatformBackingStore *QBackingStore::handle() const +{ + return d_ptr->platformBackingStore; +} + QT_END_NAMESPACE diff --git a/src/gui/painting/qbackingstore.h b/src/gui/painting/qbackingstore.h index 3ab0264b17..9f646f89ac 100644 --- a/src/gui/painting/qbackingstore.h +++ b/src/gui/painting/qbackingstore.h @@ -54,6 +54,7 @@ class QRect; class QPoint; class QImage; class QBackingStorePrivate; +class QPlatformBackingStore; class Q_GUI_EXPORT QBackingStore { @@ -81,6 +82,8 @@ public: QRegion staticContents() const; bool hasStaticContents() const; + QPlatformBackingStore *handle() const; + private: QScopedPointer<QBackingStorePrivate> d_ptr; }; |