summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@nokia.com>2009-08-26 11:09:17 (GMT)
committerAlessandro Portale <alessandro.portale@nokia.com>2009-08-26 11:13:43 (GMT)
commit878569545a06a904635b273c862a0c41dba298e2 (patch)
tree93c8d8c6174b6fc3df3d1d72e3a0369a5921142c
parent4a9f155f6159281c58f3ad1bd9fdbab274d8dc6d (diff)
downloadQt-878569545a06a904635b273c862a0c41dba298e2.zip
Qt-878569545a06a904635b273c862a0c41dba298e2.tar.gz
Qt-878569545a06a904635b273c862a0c41dba298e2.tar.bz2
Removing FONT_OUTLINE_TWEAK from the deform demo
That -no obsolete- tweak was mainly there because S60FontEngine was originally not returning glyph outlines. Task-number: 259979 Reviewed-by: jbarron modified: demos/deform/pathdeform.cpp
-rw-r--r--demos/deform/pathdeform.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/demos/deform/pathdeform.cpp b/demos/deform/pathdeform.cpp
index 5530010..07c7829 100644
--- a/demos/deform/pathdeform.cpp
+++ b/demos/deform/pathdeform.cpp
@@ -53,11 +53,6 @@
#include <QDesktopWidget>
#include <qmath.h>
-#if defined(Q_OS_SYMBIAN)
-// TODO: Remove all FONT_OUTLINE_TWEAK related code as soon as the S60FontEngine can deliver outlines
-#define FONT_OUTLINE_TWEAK
-#endif
-
PathDeformControls::PathDeformControls(QWidget *parent, PathDeformRenderer* renderer, bool smallScreen)
: QWidget(parent)
{
@@ -246,13 +241,6 @@ void PathDeformControls::layoutForSmallScreen()
QRect screen_size = QApplication::desktop()->screenGeometry();
radiusSlider->setValue(qMin(screen_size.width(), screen_size.height())/5);
-#ifdef FONT_OUTLINE_TWEAK
- radiusSlider->setValue(qMin(screen_size.width(), screen_size.height())/7);
- fontSizeLabel->setText("Qt Logo Size:");
- m_renderer->setText("A"); // Any Letter would be fine
- fontSizeSlider->setValue(100);
-#endif
-
m_renderer->setText(tr("Qt"));
}