diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-26 09:55:33 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-26 10:23:50 +0200 |
| commit | a4caa6540bbc80bf5afbdba5ddad2a873e92e274 (patch) | |
| tree | af47c120295e8d3846fdcf84cf89ec2f305b1163 | |
| parent | 6f8225417c42958e2f5e56341b369e3d0ebe4726 (diff) | |
| download | qtsvg-a4caa6540bbc80bf5afbdba5ddad2a873e92e274.tar.gz | |
Remove obsolete use of Q_WS_QWS.
Change-Id: I9733a86f079ffde911840eb37136f2c02cb96c76
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| -rw-r--r-- | examples/embedded/fluidlauncher/pictureflow.cpp | 9 | ||||
| -rw-r--r-- | src/svg/qsvghandler.cpp | 11 |
2 files changed, 2 insertions, 18 deletions
diff --git a/examples/embedded/fluidlauncher/pictureflow.cpp b/examples/embedded/fluidlauncher/pictureflow.cpp index e3df9b6..1e229b7 100644 --- a/examples/embedded/fluidlauncher/pictureflow.cpp +++ b/examples/embedded/fluidlauncher/pictureflow.cpp @@ -77,10 +77,6 @@ #include <QWidget> #include <QTime> -#ifdef Q_WS_QWS -#include <QScreen> -#endif - #include <QDebug> static const int captionFontSize = @@ -1122,11 +1118,6 @@ PictureFlow::PictureFlow(QWidget* parent): QWidget(parent) setAttribute(Qt::WA_StaticContents, true); setAttribute(Qt::WA_OpaquePaintEvent, true); setAttribute(Qt::WA_NoSystemBackground, true); - -#ifdef Q_WS_QWS - if (QScreen::instance()->pixelFormat() != QImage::Format_Invalid) - setAttribute(Qt::WA_PaintOnScreen, true); -#endif } PictureFlow::~PictureFlow() diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 87b04be..55bab45 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -636,15 +636,8 @@ static qreal toDouble(const QChar *&str) if (neg) val = -val; } else { -#if defined(Q_WS_QWS) && !defined(Q_OS_VXWORKS) - if(sizeof(qreal) == sizeof(float)) - val = strtof(temp, 0); - else -#endif - { - bool ok = false; - val = qstrtod(temp, 0, &ok); - } + bool ok = false; + val = qstrtod(temp, 0, &ok); } return val; |