diff options
author | Damian Jansen <[email protected]> | 2011-10-19 15:04:15 +1000 |
---|---|---|
committer | Qt by Nokia <[email protected]> | 2011-10-26 09:01:28 +0200 |
commit | 4ae7aecb68b506f21bd5411bf92a1e8d9fe807bb (patch) | |
tree | f264def252b28943e7dda1538ecd73e72746538a /tools/qmlviewer/qdeclarativetester.cpp | |
parent | 27933ae4ee5741d09b607635213232d94c444633 (diff) |
Remove Q_WS_*, symbian and maemo code in QtDeclarative
Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d
Reviewed-by: Alan Alpert <[email protected]>
Diffstat (limited to 'tools/qmlviewer/qdeclarativetester.cpp')
-rw-r--r-- | tools/qmlviewer/qdeclarativetester.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tools/qmlviewer/qdeclarativetester.cpp b/tools/qmlviewer/qdeclarativetester.cpp index 842c3a369d..d07b22ea6b 100644 --- a/tools/qmlviewer/qdeclarativetester.cpp +++ b/tools/qmlviewer/qdeclarativetester.cpp @@ -49,9 +49,7 @@ #include <QCryptographicHash> #include <private/qabstractanimation_p.h> #include <QGraphicsObject> -#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); } |