4 files changed, 11 insertions, 11 deletions
diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h
index ea69aea3f9..ff36ae48b4 100644
--- a/src/quick/items/qquicktext_p.h
+++ b/src/quick/items/qquicktext_p.h
@@ -248,16 +248,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);
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h
index 8733b31960..e2d7193d35 100644
--- a/src/quick/items/qquicktextinput_p.h
+++ b/src/quick/items/qquicktextinput_p.h
@@ -311,8 +311,8 @@ Q_SIGNALS:
     void selectionColorChanged();
     void selectedTextColorChanged();
     void fontChanged(const QFont &font);
-    void horizontalAlignmentChanged(HAlignment alignment);
-    void verticalAlignmentChanged(VAlignment alignment);
+    void horizontalAlignmentChanged(QQuickTextInput::HAlignment alignment);
+    void verticalAlignmentChanged(QQuickTextInput::VAlignment alignment);
     void wrapModeChanged();
     void readOnlyChanged(bool isReadOnly);
     void cursorVisibleChanged(bool isCursorVisible);
@@ -320,14 +320,14 @@ Q_SIGNALS:
     void maximumLengthChanged(int maximumLength);
     void validatorChanged();
     void inputMaskChanged(const QString &inputMask);
-    void echoModeChanged(EchoMode echoMode);
+    void echoModeChanged(QQuickTextInput::EchoMode echoMode);
     void passwordCharacterChanged();
     Q_REVISION(3) void passwordMaskDelayChanged(int delay);
     void displayTextChanged();
     void activeFocusOnPressChanged(bool activeFocusOnPress);
     void autoScrollChanged(bool autoScroll);
     void selectByMouseChanged(bool selectByMouse);
-    void mouseSelectionModeChanged(SelectionMode mode);
+    void mouseSelectionModeChanged(QQuickTextInput::SelectionMode mode);
     void persistentSelectionChanged();
     void canPasteChanged();
     void canUndoChanged();
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
index 46eae89024..0e8811bb17 100644
--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
@@ -700,7 +700,7 @@ void tst_qquicktext::textFormat()
         QQuickText *text = qobject_cast<QQuickText *>(object.data());
         QVERIFY(text);
 
-        QSignalSpy spy(text, SIGNAL(textFormatChanged(TextFormat)));
+        QSignalSpy spy(text, &QQuickText::textFormatChanged);
 
         QCOMPARE(text->textFormat(), QQuickText::AutoText);
 
diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 2a687b3c69..ce90e4c60a 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -1349,7 +1349,7 @@ void tst_qquicktextinput::mouseSelectionMode_accessors()
     QQuickTextInput *input = qobject_cast<QQuickTextInput *>(object.data());
     QVERIFY(input);
 
-    QSignalSpy spy(input, SIGNAL(mouseSelectionModeChanged(SelectionMode)));
+    QSignalSpy spy(input, &QQuickTextInput::mouseSelectionModeChanged);
 
     QCOMPARE(input->mouseSelectionMode(), QQuickTextInput::SelectCharacters);