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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/quick/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp
index cb2bf574b5..e54f5bb9c9 100644
--- a/src/quick/items/qquickimagebase.cpp
+++ b/src/quick/items/qquickimagebase.cpp
@@ -197,7 +197,7 @@ void QQuickImageBase::load()
         }
         if (autoTransform() != d->oldAutoTransform) {
             d->oldAutoTransform = autoTransform();
-            emit autoTransformBaseChanged();
+            emitAutoTransformBaseChanged();
         }
         update();
 
@@ -296,7 +296,7 @@ void QQuickImageBase::requestFinished()
     }
     if (autoTransform() != d->oldAutoTransform) {
         d->oldAutoTransform = autoTransform();
-        emit autoTransformBaseChanged();
+        emitAutoTransformBaseChanged();
     }
     update();
 }
@@ -402,7 +402,7 @@ void QQuickImageBase::setAutoTransform(bool transform)
     if (d->autoTransform != UsePluginDefault && transform == (d->autoTransform == ApplyTransform))
         return;
     d->autoTransform = transform ? ApplyTransform : DoNotApplyTransform;
-    emit autoTransformBaseChanged();
+    emitAutoTransformBaseChanged();
 }
 
 QT_END_NAMESPACE