diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-27 14:22:55 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-27 14:22:55 (GMT) |
| commit | 3f626c3e14f2fe5fdecc38d4265d74f8315b3490 (patch) | |
| tree | 357b32156e211a33841e44b7a224313c7072ee46 /tests/auto/declarative/visual/tst_visual.cpp | |
| parent | 57ce77e953b618739f6f1aec67f8e0de97e05b08 (diff) | |
| parent | 6396e7a15079cb157caef319348a0bcd0b95a6a7 (diff) | |
| download | Qt-3f626c3e14f2fe5fdecc38d4265d74f8315b3490.zip Qt-3f626c3e14f2fe5fdecc38d4265d74f8315b3490.tar.gz Qt-3f626c3e14f2fe5fdecc38d4265d74f8315b3490.tar.bz2 | |
Merge remote branch 'origin/master' into 4.7
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/declarative/graphicsitems/qdeclarativeevents.cpp
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/qml/qdeclarativescript.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativebehavior.cpp
src/declarative/util/qdeclarativeeasefollow.cpp
src/declarative/util/qdeclarativefontloader.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativespringfollow.cpp
src/declarative/util/qdeclarativestategroup.cpp
src/declarative/util/qdeclarativesystempalette.cpp
src/declarative/util/qdeclarativetimer.cpp
src/declarative/util/qmlstateoperations.cpp
src/multimedia/qml/qdeclarativeaudio.cpp
src/multimedia/qml/qdeclarativevideo.cpp
Diffstat (limited to 'tests/auto/declarative/visual/tst_visual.cpp')
| -rw-r--r-- | tests/auto/declarative/visual/tst_visual.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/declarative/visual/tst_visual.cpp b/tests/auto/declarative/visual/tst_visual.cpp index 8f41bef..cd88e87 100644 --- a/tests/auto/declarative/visual/tst_visual.cpp +++ b/tests/auto/declarative/visual/tst_visual.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QmlView> +#include <QDeclarativeView> #include <QApplication> #include <QLibraryInfo> #include <QDir> @@ -65,30 +65,30 @@ private slots: void visual(); private: - QString qmlviewer; + QString qmlruntime; }; tst_visual::tst_visual() { - qmlviewer = viewer(); + qmlruntime = viewer(); } QString tst_visual::viewer() { QString binaries = QLibraryInfo::location(QLibraryInfo::BinariesPath); - QString qmlviewer; + QString qmlruntime; #if defined(Q_WS_MAC) - qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer.app/Contents/MacOS/qmlviewer"); + qmlruntime = QDir(binaries).absoluteFilePath("qml.app/Contents/MacOS/qml"); #elif defined(Q_WS_WIN) - qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer.exe"); + qmlruntime = QDir(binaries).absoluteFilePath("qml.exe"); #else - qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer"); + qmlruntime = QDir(binaries).absoluteFilePath("qml"); #endif - return qmlviewer; + return qmlruntime; } void tst_visual::visual_data() @@ -118,7 +118,7 @@ void tst_visual::visual() << "-scriptopts" << "play,testimages,testerror,exitoncomplete,exitonfailure" << file; QProcess p; - p.start(qmlviewer, arguments); + p.start(qmlruntime, arguments); QVERIFY(p.waitForFinished()); if (p.exitCode() != 0) qDebug() << p.readAllStandardError(); @@ -211,7 +211,7 @@ void action(Mode mode, const QString &file) QStringList arguments; switch (mode) { case Test: - // Don't run qmlviewer + // Don't run qml break; case Record: arguments << "-script" << testdata |