diff options
14 files changed, 22 insertions, 22 deletions
diff --git a/tests/auto/declarative/animatedimage/tst_animatedimage.cpp b/tests/auto/declarative/animatedimage/tst_animatedimage.cpp index bedf97c..e2b96d0 100644 --- a/tests/auto/declarative/animatedimage/tst_animatedimage.cpp +++ b/tests/auto/declarative/animatedimage/tst_animatedimage.cpp @@ -4,7 +4,7 @@ #include <QtDeclarative/qmlview.h> #include <private/qmlgraphicsrect_p.h> #include <private/qmlgraphicsimage_p.h> -#include "qmlgraphicsanimatedimageitem_p.h" +#include <private/qmlgraphicsanimatedimageitem_p.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 cb535d4..8e3e522 100644 --- a/tests/auto/declarative/animations/tst_animations.cpp +++ b/tests/auto/declarative/animations/tst_animations.cpp @@ -3,7 +3,7 @@ #include <QtDeclarative/qmlcomponent.h> #include <QtDeclarative/qmlview.h> #include <private/qmlgraphicsrect_p.h> -#include <QtDeclarative/QmlNumberAnimation> +#include <private/qmlanimation_p.h> class tst_animations : public QObject { diff --git a/tests/auto/declarative/behaviors/tst_behaviors.cpp b/tests/auto/declarative/behaviors/tst_behaviors.cpp index ef2ce76..25540a2 100644 --- a/tests/auto/declarative/behaviors/tst_behaviors.cpp +++ b/tests/auto/declarative/behaviors/tst_behaviors.cpp @@ -3,7 +3,7 @@ #include <QtDeclarative/qmlcomponent.h> #include <QtDeclarative/qmlview.h> #include <private/qmlgraphicsrect_p.h> -#include <QtDeclarative/QmlNumberAnimation> +#include <private/qmlanimation_p.h> class tst_behaviors : public QObject { diff --git a/tests/auto/declarative/layouts/tst_layouts.cpp b/tests/auto/declarative/layouts/tst_layouts.cpp index 0a97768..2d9f7e8 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_p.h> +#include <private/qlistmodelinterface_p.h> #include <qmlview.h> -#include <qmlgraphicsrect_p.h> +#include <private/qmlgraphicsrect_p.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 f38e721..f1077f2 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_p.h> +#include <private/qlistmodelinterface_p.h> #include <qmlview.h> -#include <qmlgraphicslistview_p.h> -#include <qmlgraphicstext_p.h> +#include <private/qmlgraphicslistview_p.h> +#include <private/qmlgraphicstext_p.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 aa42832..385a42e 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_p.h> +#include <private/qlistmodelinterface_p.h> #include <qmlview.h> -#include <qmlgraphicspathview_p.h> -#include <qmlgraphicstext_p.h> -#include <qmlgraphicsrect_p.h> +#include <private/qmlgraphicspathview_p.h> +#include <private/qmlgraphicstext_p.h> +#include <private/qmlgraphicsrect_p.h> #include <qmlcontext.h> #include <qmlexpression.h> diff --git a/tests/auto/declarative/qfxloader/qfxloader.pro b/tests/auto/declarative/qfxloader/qfxloader.pro index 8be8cdf..aee52cc 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_qmlgraphicsloader.cpp +SOURCES += tst_qfxloader.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qfxpixmapcache/qfxpixmapcache.pro b/tests/auto/declarative/qfxpixmapcache/qfxpixmapcache.pro index 1df2f4e..218eeff 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_qmlgraphicspixmapcache.cpp +SOURCES += tst_qfxpixmapcache.cpp # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage # LIBS += -lgcov diff --git a/tests/auto/declarative/qfxtext/qfxtext.pro b/tests/auto/declarative/qfxtext/qfxtext.pro index 1d8c59f..1f3fe37 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_qmlgraphicstext.cpp +SOURCES += tst_qfxtext.cpp diff --git a/tests/auto/declarative/qfxtextedit/qfxtextedit.pro b/tests/auto/declarative/qfxtextedit/qfxtextedit.pro index 9e6a71a..b5e0464 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_qmlgraphicstextedit.cpp +SOURCES += tst_qfxtextedit.cpp # Define SRCDIR equal to test's source directory DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qfxtextinput/qfxtextinput.pro b/tests/auto/declarative/qfxtextinput/qfxtextinput.pro index fd75fec..fe2e3e3 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_qmlgraphicstextinput.cpp +SOURCES += tst_qfxtextinput.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/qfxtextinput/tst_qfxtextinput.cpp index e4930f6..79868ce 100644 --- a/tests/auto/declarative/qfxtextinput/tst_qfxtextinput.cpp +++ b/tests/auto/declarative/qfxtextinput/tst_qfxtextinput.cpp @@ -3,7 +3,7 @@ #include <QtDeclarative/qmlengine.h> #include <QFile> #include <QtDeclarative/qmlview.h> -#include <QmlGraphicsTextInput> +#include <private/qmlgraphicstextinput_p.h> #include <QDebug> class tst_qfxtextinput : public QObject diff --git a/tests/auto/declarative/repeater/tst_repeater.cpp b/tests/auto/declarative/repeater/tst_repeater.cpp index ca056fa..f39c3a3 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_p.h> +#include <private/qlistmodelinterface_p.h> #include <qmlview.h> -#include <qmlgraphicsrepeater_p.h> -#include <qmlgraphicstext_p.h> +#include <private/qmlgraphicsrepeater_p.h> +#include <private/qmlgraphicstext_p.h> #include <qmlcontext.h> class tst_QmlGraphicsRepeater : public QObject diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h index bc8fe11..b6c0ad7 100644 --- a/tools/qmlviewer/qmlviewer.h +++ b/tools/qmlviewer/qmlviewer.h @@ -15,7 +15,7 @@ #define QMLVIEWER_H #include <QMenuBar> -#include <QmlTimer> +#include <private/qmltimer_p.h> #include <QTime> #include <QList> |