Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/quick/items/qquickimagebase.cpp
	src/imports/layouts/plugin.cpp

Change-Id: I5f48474df4034a1347ec74795c85d369a55b6b21

1 files changed, 5 insertions, 5 deletions

diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h
index 0b35ad5f91..40dbd51f39 100644
--- a/src/quick/items/qquicktext_p.h
+++ b/src/quick/items/qquicktext_p.h
@@ -254,16 +254,16 @@ Q_SIGNALS:
     void fontChanged(const QFont &font);
     void colorChanged();
     void linkColorChanged();
-    void styleChanged(TextStyle style);
+    void styleChanged(QQuickText::TextStyle style);
     void styleColorChanged();
-    void horizontalAlignmentChanged(HAlignment alignment);
-    void verticalAlignmentChanged(VAlignment alignment);
+    void horizontalAlignmentChanged(QQuickText::HAlignment alignment);
+    void verticalAlignmentChanged(QQuickText::VAlignment alignment);
     void wrapModeChanged();
     void lineCountChanged();
     void truncatedChanged();
     void maximumLineCountChanged();
-    void textFormatChanged(TextFormat textFormat);
-    void elideModeChanged(TextElideMode mode);
+    void textFormatChanged(QQuickText::TextFormat textFormat);
+    void elideModeChanged(QQuickText::TextElideMode mode);
     void contentSizeChanged();
     void lineHeightChanged(qreal lineHeight);
     void lineHeightModeChanged(LineHeightMode mode);