diff options
| author | Charles Yin <charles.yin@nokia.com> | 2011-11-14 10:35:51 +1000 |
|---|---|---|
| committer | Charles Yin <charles.yin@nokia.com> | 2011-11-14 10:35:51 +1000 |
| commit | fc54db69809a16f613f65a2761fab55d5911b02c (patch) | |
| tree | a00d9284eb13f81f5b195f8a4c6cfee03edb4f17 /tools/qmlviewer/qdeclarativetester.cpp | |
| parent | 35275892ca8a7046451b8e943985dd779fee4794 (diff) | |
| parent | 2557ff5a940242b398dee65c3c79cec088164e32 (diff) | |
| download | qtdeclarative-fc54db69809a16f613f65a2761fab55d5911b02c.tar.gz | |
Merge branch 'master' into animation-refactor
Conflicts:
tools/qmlviewer/qdeclarativetester.cpp
tools/qmlviewer/qmlruntime.cpp
Change-Id: I48f0eb02df27e4b524f45927939b4c257452b0aa
Diffstat (limited to 'tools/qmlviewer/qdeclarativetester.cpp')
| -rw-r--r-- | tools/qmlviewer/qdeclarativetester.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/tools/qmlviewer/qdeclarativetester.cpp b/tools/qmlviewer/qdeclarativetester.cpp index 451950a021..69e31584db 100644 --- a/tools/qmlviewer/qdeclarativetester.cpp +++ b/tools/qmlviewer/qdeclarativetester.cpp @@ -49,9 +49,7 @@ #include <QCryptographicHash> #include <QGraphicsObject> #include <QtCore/private/qabstractanimation_p.h> -#ifndef Q_OS_SYMBIAN #include <QtQuick1/private/qdeclarativeitem_p.h> -#endif QT_BEGIN_NAMESPACE @@ -269,9 +267,8 @@ void QDeclarativeTester::save() void QDeclarativeTester::updateCurrentTime(int msec) { -#ifndef Q_OS_SYMBIAN QDeclarativeItemPrivate::setConsistentTime(msec); -#endif + if (!testscript && msec > 16 && options & QDeclarativeViewer::Snapshot) return; @@ -280,14 +277,14 @@ void QDeclarativeTester::updateCurrentTime(int msec) if (options & QDeclarativeViewer::TestImages) { img.fill(qRgb(255,255,255)); -#ifdef Q_WS_MAC +/*#ifdef Q_OS_MAC //Compile failure on Cocoa x64 QTBUG-22304 bool oldSmooth = qt_applefontsmoothing_enabled; qt_applefontsmoothing_enabled = false; -#endif +#endif*/ QPainter p(&img); -#ifdef Q_WS_MAC +/*#ifdef Q_OS_MAC //Compile failure on Cocoa x64 QTBUG-22304 qt_applefontsmoothing_enabled = oldSmooth; -#endif +#endif*/ m_view->render(&p); } @@ -450,4 +447,4 @@ void QDeclarativeTester::registerTypes() qmlRegisterType<QDeclarativeVisualTestKey>("Qt.VisualTest", 4,7, "Key"); } -QT_END_NAMESPACE +QT_END_NAMESPACE
\ No newline at end of file |