diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-30 09:08:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-30 09:08:35 +0200 |
| commit | 5112821a37ab749f758e354e84703df2d09d5471 (patch) | |
| tree | 8f19ba6e7661109675b5e1e9b0ddae94b4c96d4f /src/quick/items/qquickimagebase_p.h | |
| parent | 5d2ea1d5e9d6e29a16d0e9333cfc2dc8e7c5b677 (diff) | |
| parent | a3f686cf7cc14ff481b972b1170a7ff76d0e0fd0 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
src/qml/qml/qqmlengine.cpp
src/quick/items/qquickitemsmodule.cpp
tools/qml/main.cpp
Change-Id: Ida8daf6b4d7e675385f2f5514c446e52dedaf136
Diffstat (limited to 'src/quick/items/qquickimagebase_p.h')
| -rw-r--r-- | src/quick/items/qquickimagebase_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/items/qquickimagebase_p.h b/src/quick/items/qquickimagebase_p.h index 638b8dbdcf..98943a235c 100644 --- a/src/quick/items/qquickimagebase_p.h +++ b/src/quick/items/qquickimagebase_p.h @@ -83,6 +83,10 @@ public: void resolve2xLocalFile(const QUrl &url, qreal targetDevicePixelRatio, QUrl *sourceUrl, qreal *sourceDevicePixelRatio); + // Use a virtual rather than a signal->signal to avoid the huge + // connect/conneciton overhead for this rare case. + virtual void emitAutoTransformBaseChanged() { } + Q_SIGNALS: void sourceChanged(const QUrl &); void sourceSizeChanged(); @@ -91,7 +95,6 @@ Q_SIGNALS: void asynchronousChanged(); void cacheChanged(); void mirrorChanged(); - void autoTransformBaseChanged(); protected: virtual void load(); |