diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-07 22:00:57 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-07 22:01:11 +0100 |
| commit | 616bbd1988f3b92f7d980b6c9a1278f11b712573 (patch) | |
| tree | c6f9489bc1b53649130be21de858870f574db906 /src/quick/util/qquickpixmapcache_p.h | |
| parent | 3bc907d155034fe64efc8cb6056b48f0c6401bfb (diff) | |
| parent | 70966df1be02dd94ecf9a122ff9e4976245aeb92 (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Change-Id: I121cb9c9316b5e47476dcb982bc28b6f3f358f78
Diffstat (limited to 'src/quick/util/qquickpixmapcache_p.h')
| -rw-r--r-- | src/quick/util/qquickpixmapcache_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquickpixmapcache_p.h b/src/quick/util/qquickpixmapcache_p.h index ef17a12709..03f2e65cc2 100644 --- a/src/quick/util/qquickpixmapcache_p.h +++ b/src/quick/util/qquickpixmapcache_p.h @@ -104,7 +104,7 @@ public: const QUrl &url() const; const QSize &implicitSize() const; const QSize &requestSize() const; - const QImage &image() const; + QImage image() const; void setImage(const QImage &); QQuickTextureFactory *textureFactory() const; |