diff options
Diffstat (limited to 'tests/auto/declarative')
22 files changed, 29 insertions, 29 deletions
diff --git a/tests/auto/declarative/anchors/tst_anchors.cpp b/tests/auto/declarative/anchors/tst_anchors.cpp index fea6ef3..ec6a951 100644 --- a/tests/auto/declarative/anchors/tst_anchors.cpp +++ b/tests/auto/declarative/anchors/tst_anchors.cpp @@ -2,8 +2,8 @@ #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcomponent.h> #include <QtDeclarative/qmlview.h> -#include <QtDeclarative/qfxrect.h> -#include <QtDeclarative/private/qfxanchors_p.h> +#include <QtDeclarative/qmlgraphicsrect.h> +#include <QtDeclarative/private/qmlgraphicsanchors_p.h> class tst_anchors : public QObject diff --git a/tests/auto/declarative/animatedimage/tst_animatedimage.cpp b/tests/auto/declarative/animatedimage/tst_animatedimage.cpp index 46c953d..099daec 100644 --- a/tests/auto/declarative/animatedimage/tst_animatedimage.cpp +++ b/tests/auto/declarative/animatedimage/tst_animatedimage.cpp @@ -2,9 +2,9 @@ #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcomponent.h> #include <QtDeclarative/qmlview.h> -#include <QtDeclarative/qfxrect.h> -#include <QtDeclarative/qfximage.h> -#include "qfxanimatedimageitem.h" +#include <QtDeclarative/qmlgraphicsrect.h> +#include <QtDeclarative/qmlgraphicsimage.h> +#include "qmlgraphicsanimatedimageitem.h" class tst_animatedimage : public QObject { diff --git a/tests/auto/declarative/animations/tst_animations.cpp b/tests/auto/declarative/animations/tst_animations.cpp index b5cc9d4..eaf4d14 100644 --- a/tests/auto/declarative/animations/tst_animations.cpp +++ b/tests/auto/declarative/animations/tst_animations.cpp @@ -2,7 +2,7 @@ #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcomponent.h> #include <QtDeclarative/qmlview.h> -#include <QtDeclarative/qfxrect.h> +#include <QtDeclarative/qmlgraphicsrect.h> #include <QtDeclarative/QmlNumberAnimation> class tst_animations : public QObject diff --git a/tests/auto/declarative/behaviors/tst_behaviors.cpp b/tests/auto/declarative/behaviors/tst_behaviors.cpp index 079e2e7..b225a7d 100644 --- a/tests/auto/declarative/behaviors/tst_behaviors.cpp +++ b/tests/auto/declarative/behaviors/tst_behaviors.cpp @@ -2,7 +2,7 @@ #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcomponent.h> #include <QtDeclarative/qmlview.h> -#include <QtDeclarative/qfxrect.h> +#include <QtDeclarative/qmlgraphicsrect.h> #include <QtDeclarative/QmlNumberAnimation> class tst_behaviors : public QObject diff --git a/tests/auto/declarative/layouts/tst_layouts.cpp b/tests/auto/declarative/layouts/tst_layouts.cpp index 70755ff..0b9e402 100644 --- a/tests/auto/declarative/layouts/tst_layouts.cpp +++ b/tests/auto/declarative/layouts/tst_layouts.cpp @@ -1,7 +1,7 @@ #include <QtTest/QtTest> #include <qlistmodelinterface.h> #include <qmlview.h> -#include <qfxrect.h> +#include <qmlgraphicsrect.h> #include <qmlexpression.h> class tst_QmlGraphicsLayouts : public QObject diff --git a/tests/auto/declarative/listview/tst_listview.cpp b/tests/auto/declarative/listview/tst_listview.cpp index be65338..4e0f6cb 100644 --- a/tests/auto/declarative/listview/tst_listview.cpp +++ b/tests/auto/declarative/listview/tst_listview.cpp @@ -1,8 +1,8 @@ #include <QtTest/QtTest> #include <qlistmodelinterface.h> #include <qmlview.h> -#include <qfxlistview.h> -#include <qfxtext.h> +#include <qmlgraphicslistview.h> +#include <qmlgraphicstext.h> #include <qmlcontext.h> #include <qmlexpression.h> diff --git a/tests/auto/declarative/pathview/tst_pathview.cpp b/tests/auto/declarative/pathview/tst_pathview.cpp index d5b922a..013edf5 100644 --- a/tests/auto/declarative/pathview/tst_pathview.cpp +++ b/tests/auto/declarative/pathview/tst_pathview.cpp @@ -1,9 +1,9 @@ #include <QtTest/QtTest> #include <qlistmodelinterface.h> #include <qmlview.h> -#include <qfxpathview.h> -#include <qfxtext.h> -#include <qfxrect.h> +#include <qmlgraphicspathview.h> +#include <qmlgraphicstext.h> +#include <qmlgraphicsrect.h> #include <qmlcontext.h> #include <qmlexpression.h> diff --git a/tests/auto/declarative/qfxloader/qfxloader.pro b/tests/auto/declarative/qfxloader/qfxloader.pro index aee52cc..8be8cdf 100644 --- a/tests/auto/declarative/qfxloader/qfxloader.pro +++ b/tests/auto/declarative/qfxloader/qfxloader.pro @@ -2,6 +2,6 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative gui macx:CONFIG -= app_bundle -SOURCES += tst_qfxloader.cpp +SOURCES += tst_qmlgraphicsloader.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qfxloader/tst_qfxloader.cpp b/tests/auto/declarative/qfxloader/tst_qfxloader.cpp index 99fecc3..c54c151 100644 --- a/tests/auto/declarative/qfxloader/tst_qfxloader.cpp +++ b/tests/auto/declarative/qfxloader/tst_qfxloader.cpp @@ -1,7 +1,7 @@ #include <qtest.h> #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcomponent.h> -#include <QtDeclarative/qfxloader.h> +#include <QtDeclarative/qmlgraphicsloader.h> class tst_qfxloader : public QObject diff --git a/tests/auto/declarative/qfxpixmapcache/qfxpixmapcache.pro b/tests/auto/declarative/qfxpixmapcache/qfxpixmapcache.pro index 218eeff..1df2f4e 100644 --- a/tests/auto/declarative/qfxpixmapcache/qfxpixmapcache.pro +++ b/tests/auto/declarative/qfxpixmapcache/qfxpixmapcache.pro @@ -3,7 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative QT += network macx:CONFIG -= app_bundle -SOURCES += tst_qfxpixmapcache.cpp +SOURCES += tst_qmlgraphicspixmapcache.cpp # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage # LIBS += -lgcov diff --git a/tests/auto/declarative/qfxpixmapcache/tst_qfxpixmapcache.cpp b/tests/auto/declarative/qfxpixmapcache/tst_qfxpixmapcache.cpp index e735066..14f3f19 100644 --- a/tests/auto/declarative/qfxpixmapcache/tst_qfxpixmapcache.cpp +++ b/tests/auto/declarative/qfxpixmapcache/tst_qfxpixmapcache.cpp @@ -1,6 +1,6 @@ #include <qtest.h> #include <QtTest/QtTest> -#include <QtDeclarative/qfxpixmapcache.h> +#include <QtDeclarative/qmlgraphicspixmapcache.h> #include <QtDeclarative/qmlengine.h> #include <QNetworkReply> diff --git a/tests/auto/declarative/qfxtext/qfxtext.pro b/tests/auto/declarative/qfxtext/qfxtext.pro index 1f3fe37..1d8c59f 100644 --- a/tests/auto/declarative/qfxtext/qfxtext.pro +++ b/tests/auto/declarative/qfxtext/qfxtext.pro @@ -2,4 +2,4 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative gui macx:CONFIG -= app_bundle -SOURCES += tst_qfxtext.cpp +SOURCES += tst_qmlgraphicstext.cpp diff --git a/tests/auto/declarative/qfxtext/tst_qfxtext.cpp b/tests/auto/declarative/qfxtext/tst_qfxtext.cpp index 12cac68..4011851 100644 --- a/tests/auto/declarative/qfxtext/tst_qfxtext.cpp +++ b/tests/auto/declarative/qfxtext/tst_qfxtext.cpp @@ -2,7 +2,7 @@ #include <QTextDocument> #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcomponent.h> -#include <QtDeclarative/qfxtext.h> +#include <QtDeclarative/qmlgraphicstext.h> #include <QFontMetrics> class tst_qfxtext : public QObject diff --git a/tests/auto/declarative/qfxtextedit/qfxtextedit.pro b/tests/auto/declarative/qfxtextedit/qfxtextedit.pro index b5e0464..9e6a71a 100644 --- a/tests/auto/declarative/qfxtextedit/qfxtextedit.pro +++ b/tests/auto/declarative/qfxtextedit/qfxtextedit.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/qfxtextedit/tst_qfxtextedit.cpp index 0565fd4..cab8666 100644 --- a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp +++ b/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp @@ -6,7 +6,7 @@ #include <QtDeclarative/qmlcontext.h> #include <QtDeclarative/qmlexpression.h> #include <QtDeclarative/qmlcomponent.h> -#include <QtDeclarative/qfxtextedit.h> +#include <QtDeclarative/qmlgraphicstextedit.h> #include <QFontMetrics> #include <QmlView> diff --git a/tests/auto/declarative/qfxtextinput/qfxtextinput.pro b/tests/auto/declarative/qfxtextinput/qfxtextinput.pro index fe2e3e3..fd75fec 100644 --- a/tests/auto/declarative/qfxtextinput/qfxtextinput.pro +++ b/tests/auto/declarative/qfxtextinput/qfxtextinput.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/qfxwebview/qfxwebview.pro b/tests/auto/declarative/qfxwebview/qfxwebview.pro index b75e057..cce3df2 100644 --- a/tests/auto/declarative/qfxwebview/qfxwebview.pro +++ b/tests/auto/declarative/qfxwebview/qfxwebview.pro @@ -2,7 +2,7 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative macx:CONFIG -= app_bundle -SOURCES += tst_qfxwebview.cpp +SOURCES += tst_qmlgraphicswebview.cpp # Define SRCDIR equal to test's source directory DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qfxwebview/tst_qfxwebview.cpp b/tests/auto/declarative/qfxwebview/tst_qfxwebview.cpp index 6e3336c..eeaef89 100644 --- a/tests/auto/declarative/qfxwebview/tst_qfxwebview.cpp +++ b/tests/auto/declarative/qfxwebview/tst_qfxwebview.cpp @@ -2,7 +2,7 @@ #include "../../../shared/util.h" #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcomponent.h> -#include <QtDeclarative/qfxwebview.h> +#include <QtDeclarative/qmlgraphicswebview.h> #include <QtWebKit/qwebpage.h> #include <QtWebKit/qwebframe.h> #include <QtCore/qdir.h> diff --git a/tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp b/tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp index d11771c..f3e62ab 100644 --- a/tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp +++ b/tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp @@ -3,7 +3,7 @@ #include <QtDeclarative/qmlcontext.h> #include <QtDeclarative/qmlpropertymap.h> #include <QtDeclarative/qmlcomponent.h> -#include <QtDeclarative/qfxtext.h> +#include <QtDeclarative/qmlgraphicstext.h> #include <QSignalSpy> class tst_QmlPropertyMap : public QObject diff --git a/tests/auto/declarative/repeater/tst_repeater.cpp b/tests/auto/declarative/repeater/tst_repeater.cpp index 0622028..8354005 100644 --- a/tests/auto/declarative/repeater/tst_repeater.cpp +++ b/tests/auto/declarative/repeater/tst_repeater.cpp @@ -1,8 +1,8 @@ #include <QtTest/QtTest> #include <qlistmodelinterface.h> #include <qmlview.h> -#include <qfxrepeater.h> -#include <qfxtext.h> +#include <qmlgraphicsrepeater.h> +#include <qmlgraphicstext.h> #include <qmlcontext.h> class tst_QmlGraphicsRepeater : public QObject diff --git a/tests/auto/declarative/sql/tst_sql.cpp b/tests/auto/declarative/sql/tst_sql.cpp index e938ee4..ce73c0c 100644 --- a/tests/auto/declarative/sql/tst_sql.cpp +++ b/tests/auto/declarative/sql/tst_sql.cpp @@ -2,7 +2,7 @@ #include "../../../shared/util.h" #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcomponent.h> -#include <QtDeclarative/qfxtext.h> +#include <QtDeclarative/qmlgraphicstext.h> #include <QtWebKit/qwebpage.h> #include <QtWebKit/qwebframe.h> #include <QtWebKit/qwebdatabase.h> diff --git a/tests/auto/declarative/states/tst_states.cpp b/tests/auto/declarative/states/tst_states.cpp index 91b6d0b..218baf8 100644 --- a/tests/auto/declarative/states/tst_states.cpp +++ b/tests/auto/declarative/states/tst_states.cpp @@ -1,7 +1,7 @@ #include <qtest.h> #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcomponent.h> -#include <QtDeclarative/qfxrect.h> +#include <QtDeclarative/qmlgraphicsrect.h> class tst_states : public QObject { |