aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlviewer/qdeclarativetester.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/qmlviewer/qdeclarativetester.cpp')
-rw-r--r--tools/qmlviewer/qdeclarativetester.cpp13
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);
}