5 files changed, 17 insertions, 17 deletions
diff --git a/src/quicktestlib/qdeclarativetest.h b/src/quicktestlib/qdeclarativetest.h
index b76eb72..f89868d 100644
--- a/src/quicktestlib/qdeclarativetest.h
+++ b/src/quicktestlib/qdeclarativetest.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 typedef QWidget *(*qtest_create_viewport)();
 
-Q_TEST_QUICK_EXPORT int qtest_quick_main(int argc, char **argv, const char *name, qtest_create_viewport createViewport, const char *sourceDir);
+Q_QUICK_TEST_EXPORT int qtest_quick_main(int argc, char **argv, const char *name, qtest_create_viewport createViewport, const char *sourceDir);
 
 #ifdef QTEST_QUICK_SOURCE_DIR
 
diff --git a/src/quicktestlib/qdeclarativetestresult_p.h b/src/quicktestlib/qdeclarativetestresult_p.h
index bb55a78..776a77a 100644
--- a/src/quicktestlib/qdeclarativetestresult_p.h
+++ b/src/quicktestlib/qdeclarativetestresult_p.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 class QDeclarativeTestResultPrivate;
 
-class Q_TEST_QUICK_EXPORT QDeclarativeTestResult : public QObject
+class Q_QUICK_TEST_EXPORT QDeclarativeTestResult : public QObject
 {
     Q_OBJECT
     Q_ENUMS(FunctionType)
diff --git a/src/quicktestlib/quicktestglobal.h b/src/quicktestlib/quicktestglobal.h
index cfdad78..0c71b5c 100644
--- a/src/quicktestlib/quicktestglobal.h
+++ b/src/quicktestlib/quicktestglobal.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qglobal.h>
 
-QT_LICENSED_MODULE(QtTestQuick)
+QT_LICENSED_MODULE(QtQuickTest)
 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
 #  if defined(QT_NODLL)
 #    undef QT_MAKEDLL
@@ -53,20 +53,20 @@ QT_LICENSED_MODULE(QtTestQuick)
 #    if defined(QT_DLL)
 #      undef QT_DLL
 #    endif
-#    if defined(QT_BUILD_TEST_QUICK_LIB)
-#        define Q_TEST_QUICK_EXPORT Q_DECL_EXPORT
+#    if defined(QT_BUILD_QUICK_TEST_LIB)
+#        define Q_QUICK_TEST_EXPORT Q_DECL_EXPORT
 #    else
-#        define Q_TEST_QUICK_EXPORT Q_DECL_IMPORT
+#        define Q_QUICK_TEST_EXPORT Q_DECL_IMPORT
 #    endif
 #  elif defined(QT_DLL) /* use a Qt DLL library */
-#    define Q_TEST_QUICK_EXPORT Q_DECL_IMPORT
+#    define Q_QUICK_TEST_EXPORT Q_DECL_IMPORT
 #  endif
 #endif
-#if !defined(Q_TEST_QUICK_EXPORT)
+#if !defined(Q_QUICK_TEST_EXPORT)
 #   if defined(QT_SHARED)
-#       define Q_TEST_QUICK_EXPORT Q_DECL_EXPORT
+#       define Q_QUICK_TEST_EXPORT Q_DECL_EXPORT
 #   else
-#       define Q_TEST_QUICK_EXPORT
+#       define Q_QUICK_TEST_EXPORT
 #   endif
 #endif
 
diff --git a/src/quicktestlib/quicktestlib.pro b/src/quicktestlib/quicktestlib.pro
index bd29bdf..1ca306e 100644
--- a/src/quicktestlib/quicktestlib.pro
+++ b/src/quicktestlib/quicktestlib.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-TARGET = QtTestQuick$${QT_LIBINFIX}
+TARGET = QtQuickTest$${QT_LIBINFIX}
 CONFIG += dll warn_on
 QT += declarative
 DESTDIR = ../../lib
@@ -38,13 +38,13 @@ HEADERS += $$PRIVATE_HEADERS
 
 include(testlib/testlib.pri)
 
-DEFINES += QT_BUILD_TEST_QUICK_LIB
+DEFINES += QT_BUILD_QUCIK_TEST_LIB
 
 !symbian {
     target.path += $$[QT_INSTALL_LIBS]
     INSTALLS += target
 
-    install_headers.path = $$[QT_INSTALL_HEADERS]/QtTestQuick
+    install_headers.path = $$[QT_INSTALL_HEADERS]/QtQuickTest
     install_headers.files = $$PUBLIC_HEADERS
     INSTALLS += install_headers
 } else {
@@ -58,7 +58,7 @@ DEFINES += QT_BUILD_TEST_QUICK_LIB
         for(entry, entries) {
             exists($$entry) {
                 contains(PUBLIC_HEADERS, $$basename(entry)) {
-                    BLD_INF_RULES.prj_exports += "$$entry $$MW_LAYER_PUBLIC_EXPORT_PATH(QtTestQuick/$$basename(entry))"
+                    BLD_INF_RULES.prj_exports += "$$entry $$MW_LAYER_PUBLIC_EXPORT_PATH(QtQuickTest/$$basename(entry))"
                 }
             }
         }
diff --git a/src/quicktestlib/quicktestlib_dep.pri b/src/quicktestlib/quicktestlib_dep.pri
index a615cd3..9f60c4a 100644
--- a/src/quicktestlib/quicktestlib_dep.pri
+++ b/src/quicktestlib/quicktestlib_dep.pri
@@ -5,14 +5,14 @@ INCLUDEPATH += $$PWD
 LIBS += -L../../lib -L../../bin
 
 win32:CONFIG(debug, debug|release) {
-    LIBS += -lQtTestQuick$${QT_LIBINFIX}d
+    LIBS += -lQtQuickTest$${QT_LIBINFIX}d
 } else {
-    LIBS += -lQtTestQuick$${QT_LIBINFIX}
+    LIBS += -lQtQuickTest$${QT_LIBINFIX}
 }
 
 # Locate the "lib" directory in the build tree and put it before
 # the Qt "lib" directory in the library path so that we link
-# against the libQtTestQuick.so in our build tree, not the Qt one.
+# against the libQtQuickTest.so in our build tree, not the Qt one.
 FIND_TOP=..
 for(i,forever) {
     exists($$_PRO_FILE_PWD_/$$FIND_TOP/qtest-qml.pro):break()