9 files changed, 38 insertions, 38 deletions
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 000ceb3..b6d2241 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -13,8 +13,6 @@ SUBDIRS += \
            parserstress \           # Cover
            pathview \               # Cover
            qfxloader \              # Cover
-           qfxtextedit \            # Cover
-           qfxtextinput \           # Cover
            qmetaobjectbuilder \     # Cover
            qmlbinding \             # Cover
            qmlconnection \          # Cover
@@ -27,6 +25,8 @@ SUBDIRS += \
            qmlgraphicsborderimage \ # Cover
            qmlgraphicsparticles \   # Cover
            qmlgraphicstext \        # Cover
+           qmlgraphicstextedit \    # Cover
+           qmlgraphicstextinput \   # Cover
            qmlgraphicswebview \     # Cover
            qmlinfo \                # Cover
            qmllanguage \            # Cover
diff --git a/tests/auto/declarative/qfxtextedit/data/cursorTest.qml b/tests/auto/declarative/qmlgraphicstextedit/data/cursorTest.qml
index e5df8f1..e5df8f1 100644
--- a/tests/auto/declarative/qfxtextedit/data/cursorTest.qml
+++ b/tests/auto/declarative/qmlgraphicstextedit/data/cursorTest.qml
diff --git a/tests/auto/declarative/qfxtextedit/data/navigation.qml b/tests/auto/declarative/qmlgraphicstextedit/data/navigation.qml
index 5b8613f..5b8613f 100644
--- a/tests/auto/declarative/qfxtextedit/data/navigation.qml
+++ b/tests/auto/declarative/qmlgraphicstextedit/data/navigation.qml
diff --git a/tests/auto/declarative/qfxtextedit/qfxtextedit.pro b/tests/auto/declarative/qmlgraphicstextedit/qmlgraphicstextedit.pro
index b5e0464..9e6a71a 100644
--- a/tests/auto/declarative/qfxtextedit/qfxtextedit.pro
+++ b/tests/auto/declarative/qmlgraphicstextedit/qmlgraphicstextedit.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qfxtextedit.cpp
+SOURCES += tst_qmlgraphicstextedit.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp b/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp
index 19d5998..4287f01 100644
--- a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp
+++ b/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp
@@ -51,12 +51,12 @@
 #include <QFontMetrics>
 #include <QmlView>
 
-class tst_qfxtextedit : public QObject
+class tst_qmlgraphicstextedit : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_qfxtextedit();
+    tst_qmlgraphicstextedit();
 
 private slots:
     void text();
@@ -91,7 +91,7 @@ private:
     QmlEngine engine;
 };
 
-tst_qfxtextedit::tst_qfxtextedit()
+tst_qmlgraphicstextedit::tst_qmlgraphicstextedit()
 {
     standard << "the quick brown fox jumped over the lazy dog"
              << "the quick brown fox\n jumped over the lazy dog";
@@ -134,7 +134,7 @@ tst_qfxtextedit::tst_qfxtextedit()
                  // 
 }
 
-void tst_qfxtextedit::text()
+void tst_qmlgraphicstextedit::text()
 {
     {
         QmlComponent texteditComponent(&engine, "import Qt 4.6\nTextEdit {  text: \"\"  }", QUrl());
@@ -170,7 +170,7 @@ void tst_qfxtextedit::text()
     }
 }
 
-void tst_qfxtextedit::width()
+void tst_qmlgraphicstextedit::width()
 {
     // uses Font metrics to find the width for standard and document to find the width for rich
     {
@@ -213,7 +213,7 @@ void tst_qfxtextedit::width()
     }
 }
 
-void tst_qfxtextedit::wrap()
+void tst_qmlgraphicstextedit::wrap()
 {
     // for specified width and wrap set true
     {
@@ -247,7 +247,7 @@ void tst_qfxtextedit::wrap()
 }
 
 //the alignment tests may be trivial o.oa
-void tst_qfxtextedit::hAlign()
+void tst_qmlgraphicstextedit::hAlign()
 {
     //test one align each, and then test if two align fails.
 
@@ -279,7 +279,7 @@ void tst_qfxtextedit::hAlign()
 
 }
 
-void tst_qfxtextedit::vAlign()
+void tst_qmlgraphicstextedit::vAlign()
 {
     //test one align each, and then test if two align fails.
 
@@ -311,7 +311,7 @@ void tst_qfxtextedit::vAlign()
 
 }
 
-void tst_qfxtextedit::font()
+void tst_qmlgraphicstextedit::font()
 {
     //test size, then bold, then italic, then family
     { 
@@ -366,7 +366,7 @@ void tst_qfxtextedit::font()
     }
 }
 
-void tst_qfxtextedit::color()
+void tst_qmlgraphicstextedit::color()
 {
     //test style
     for (int i = 0; i < colorStrings.size(); i++)
@@ -393,7 +393,7 @@ void tst_qfxtextedit::color()
     }
 }
 
-void tst_qfxtextedit::selection()
+void tst_qmlgraphicstextedit::selection()
 {
     QString testStr = standard[0];//TODO: What should happen for multiline/rich text?
     QString componentStr = "import Qt 4.6\nTextEdit {  text: \""+ testStr +"\"; }";
@@ -473,7 +473,7 @@ void tst_qfxtextedit::selection()
     QVERIFY(textEditObject->selectedText().size() == 10);
 }
 
-void tst_qfxtextedit::cursorDelegate()
+void tst_qmlgraphicstextedit::cursorDelegate()
 {
     QmlView* view = createView(SRCDIR "/data/cursorTest.qml");
     view->execute();
@@ -504,7 +504,7 @@ void tst_qfxtextedit::cursorDelegate()
 TextEdit element should only handle left/right keys until the cursor reaches
 the extent of the text, then they should ignore the keys.
 */
-void tst_qfxtextedit::navigation()
+void tst_qmlgraphicstextedit::navigation()
 {
     QmlView *canvas = createView(SRCDIR "/data/navigation.qml");
     canvas->execute();
@@ -528,7 +528,7 @@ void tst_qfxtextedit::navigation()
     QVERIFY(input->hasFocus() == true);
 }
 
-void tst_qfxtextedit::simulateKey(QmlView *view, int key)
+void tst_qmlgraphicstextedit::simulateKey(QmlView *view, int key)
 {
     QKeyEvent press(QKeyEvent::KeyPress, key, 0);
     QKeyEvent release(QKeyEvent::KeyRelease, key, 0);
@@ -537,7 +537,7 @@ void tst_qfxtextedit::simulateKey(QmlView *view, int key)
     QApplication::sendEvent(view, &release);
 }
 
-QmlView *tst_qfxtextedit::createView(const QString &filename)
+QmlView *tst_qmlgraphicstextedit::createView(const QString &filename)
 {
     QmlView *canvas = new QmlView(0);
 
@@ -550,6 +550,6 @@ QmlView *tst_qfxtextedit::createView(const QString &filename)
 }
 
 
-QTEST_MAIN(tst_qfxtextedit)
+QTEST_MAIN(tst_qmlgraphicstextedit)
 
-#include "tst_qfxtextedit.moc"
+#include "tst_qmlgraphicstextedit.moc"
diff --git a/tests/auto/declarative/qfxtextinput/data/cursorTest.qml b/tests/auto/declarative/qmlgraphicstextinput/data/cursorTest.qml
index ddc98cc..ddc98cc 100644
--- a/tests/auto/declarative/qfxtextinput/data/cursorTest.qml
+++ b/tests/auto/declarative/qmlgraphicstextinput/data/cursorTest.qml
diff --git a/tests/auto/declarative/qfxtextinput/data/navigation.qml b/tests/auto/declarative/qmlgraphicstextinput/data/navigation.qml
index 282c52c..282c52c 100644
--- a/tests/auto/declarative/qfxtextinput/data/navigation.qml
+++ b/tests/auto/declarative/qmlgraphicstextinput/data/navigation.qml
diff --git a/tests/auto/declarative/qfxtextinput/qfxtextinput.pro b/tests/auto/declarative/qmlgraphicstextinput/qmlgraphicstextinput.pro
index fe2e3e3..fd75fec 100644
--- a/tests/auto/declarative/qfxtextinput/qfxtextinput.pro
+++ b/tests/auto/declarative/qmlgraphicstextinput/qmlgraphicstextinput.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qfxtextinput.cpp
+SOURCES += tst_qmlgraphicstextinput.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qfxtextinput/tst_qfxtextinput.cpp b/tests/auto/declarative/qmlgraphicstextinput/tst_qmlgraphicstextinput.cpp
index 8eeb22d..8e9fa5e 100644
--- a/tests/auto/declarative/qfxtextinput/tst_qfxtextinput.cpp
+++ b/tests/auto/declarative/qmlgraphicstextinput/tst_qmlgraphicstextinput.cpp
@@ -46,12 +46,12 @@
 #include <private/qmlgraphicstextinput_p.h>
 #include <QDebug>
 
-class tst_qfxtextinput : public QObject
+class tst_qmlgraphicstextinput : public QObject
 
 {
     Q_OBJECT
 public:
-    tst_qfxtextinput();
+    tst_qmlgraphicstextinput();
 
 private slots:
     void text();
@@ -76,7 +76,7 @@ private:
     QStringList colorStrings;
 };
 
-tst_qfxtextinput::tst_qfxtextinput()
+tst_qmlgraphicstextinput::tst_qmlgraphicstextinput()
 {
     standard << "the quick brown fox jumped over the lazy dog"
         << "It's supercalifragisiticexpialidocious!"
@@ -96,7 +96,7 @@ tst_qfxtextinput::tst_qfxtextinput()
                  << "#2AC05F";
 }
 
-void tst_qfxtextinput::text()
+void tst_qmlgraphicstextinput::text()
 {
     {
         QmlComponent textinputComponent(&engine, "import Qt 4.6\nTextInput {  text: \"\"  }", QUrl());
@@ -118,7 +118,7 @@ void tst_qfxtextinput::text()
 
 }
 
-void tst_qfxtextinput::width()
+void tst_qmlgraphicstextinput::width()
 {
     // uses Font metrics to find the width for standard
     {
@@ -144,7 +144,7 @@ void tst_qfxtextinput::width()
     }
 }
 
-void tst_qfxtextinput::font()
+void tst_qmlgraphicstextinput::font()
 {
     //test size, then bold, then italic, then family
     { 
@@ -199,7 +199,7 @@ void tst_qfxtextinput::font()
     }
 }
 
-void tst_qfxtextinput::color()
+void tst_qmlgraphicstextinput::color()
 {
     //test style
     for (int i = 0; i < colorStrings.size(); i++)
@@ -226,7 +226,7 @@ void tst_qfxtextinput::color()
     }
 }
 
-void tst_qfxtextinput::selection()
+void tst_qmlgraphicstextinput::selection()
 {
     QString testStr = standard[0];
     QString componentStr = "import Qt 4.6\nTextInput {  text: \""+ testStr +"\"; }";
@@ -306,7 +306,7 @@ void tst_qfxtextinput::selection()
     QVERIFY(textinputObject->selectedText().size() == 10);
 }
 
-void tst_qfxtextinput::maxLength()
+void tst_qmlgraphicstextinput::maxLength()
 {
     QString componentStr = "import Qt 4.6\nTextInput {  maximumLength: 10; }";
     QmlComponent textinputComponent(&engine, componentStr.toLatin1(), QUrl());
@@ -321,7 +321,7 @@ void tst_qfxtextinput::maxLength()
     //TODO: Simulated keypress input adding 11 chars at a time
 }
 
-void tst_qfxtextinput::masks()
+void tst_qmlgraphicstextinput::masks()
 {
     QString componentStr = "import Qt 4.6\nTextInput {  maximumLength: 10; }";
     QmlComponent textinputComponent(&engine, componentStr.toLatin1(), QUrl());
@@ -331,7 +331,7 @@ void tst_qfxtextinput::masks()
     //TODO: Me
 }
 
-void tst_qfxtextinput::validators()
+void tst_qmlgraphicstextinput::validators()
 {
     QString componentStr = "import Qt 4.6\nTextInput {  maximumLength: 10; }";
     QmlComponent textinputComponent(&engine, componentStr.toLatin1(), QUrl());
@@ -345,7 +345,7 @@ void tst_qfxtextinput::validators()
 TextInput element should only handle left/right keys until the cursor reaches
 the extent of the text, then they should ignore the keys.
 */
-void tst_qfxtextinput::navigation()
+void tst_qmlgraphicstextinput::navigation()
 {
     QmlView *canvas = createView(SRCDIR "/data/navigation.qml");
     canvas->execute();
@@ -368,7 +368,7 @@ void tst_qfxtextinput::navigation()
     QVERIFY(input->hasFocus() == true);
 }
 
-void tst_qfxtextinput::cursorDelegate()
+void tst_qmlgraphicstextinput::cursorDelegate()
 {
     QmlView* view = createView(SRCDIR "/data/cursorTest.qml");
     view->execute();
@@ -396,7 +396,7 @@ void tst_qfxtextinput::cursorDelegate()
     QVERIFY(!textInputObject->findChild<QmlGraphicsItem*>("cursorInstance"));
 }
 
-void tst_qfxtextinput::simulateKey(QmlView *view, int key)
+void tst_qmlgraphicstextinput::simulateKey(QmlView *view, int key)
 {
     QKeyEvent press(QKeyEvent::KeyPress, key, 0);
     QKeyEvent release(QKeyEvent::KeyRelease, key, 0);
@@ -405,7 +405,7 @@ void tst_qfxtextinput::simulateKey(QmlView *view, int key)
     QApplication::sendEvent(view, &release);
 }
 
-QmlView *tst_qfxtextinput::createView(const QString &filename)
+QmlView *tst_qmlgraphicstextinput::createView(const QString &filename)
 {
     QmlView *canvas = new QmlView(0);
 
@@ -417,6 +417,6 @@ QmlView *tst_qfxtextinput::createView(const QString &filename)
     return canvas;
 }
 
-QTEST_MAIN(tst_qfxtextinput)
+QTEST_MAIN(tst_qmlgraphicstextinput)
 
-#include "tst_qfxtextinput.moc"
+#include "tst_qmlgraphicstextinput.moc"