summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf4
-rw-r--r--examples/svg/embedded/desktopservices/contenttab.cpp5
-rw-r--r--examples/svg/embedded/desktopservices/desktopservices.pro7
-rw-r--r--examples/svg/embedded/embedded.pro2
-rw-r--r--examples/svg/embedded/fluidlauncher/config_wince/config.xml13
-rw-r--r--examples/svg/embedded/fluidlauncher/fluidlauncher.pro35
-rw-r--r--examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro5
-rw-r--r--examples/svg/network/bearercloud/bearercloud.cpp39
-rw-r--r--examples/svg/network/bearercloud/cloud.cpp7
-rw-r--r--examples/svg/network/bearercloud/main.cpp8
-rw-r--r--examples/svg/opengl/framebufferobject/framebufferobject.pro2
-rw-r--r--examples/svg/opengl/opengl.pro2
-rw-r--r--examples/svg/svg.pro2
-rw-r--r--examples/svg/svgviewer/exportdialog.cpp3
-rw-r--r--examples/svg/svgviewer/svgviewer.pro6
-rw-r--r--src/svg/qsvgfunctions_wince.cpp134
-rw-r--r--src/svg/qsvgfunctions_wince_p.h95
-rw-r--r--src/svg/qsvggenerator.cpp8
-rw-r--r--src/svg/svg.pro18
-rw-r--r--tests/auto/qicon_svg/qicon_svg.pro3
-rw-r--r--tests/auto/qsvggenerator/qsvggenerator.pro12
-rw-r--r--tests/auto/qsvggenerator/tst_qsvggenerator.cpp12
-rw-r--r--tests/auto/qsvgrenderer/qsvgrenderer.pro10
23 files changed, 52 insertions, 380 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 45d16f2..d1e1c4c 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,4 +1,6 @@
load(qt_build_config)
+
CONFIG += warning_clean
+DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.7.1
+MODULE_VERSION = 5.8.0
diff --git a/examples/svg/embedded/desktopservices/contenttab.cpp b/examples/svg/embedded/desktopservices/contenttab.cpp
index d388c23..8d467df 100644
--- a/examples/svg/embedded/desktopservices/contenttab.cpp
+++ b/examples/svg/embedded/desktopservices/contenttab.cpp
@@ -104,10 +104,9 @@ void ContentTab::setIcon(const QString &icon)
void ContentTab::populateListWidget()
{
- QFileInfoList fileList = m_ContentDir.entryInfoList(QDir::Files, QDir::Time);
- foreach(QFileInfo item, fileList) {
+ const QFileInfoList fileList = m_ContentDir.entryInfoList(QDir::Files, QDir::Time);
+ for (const QFileInfo &item : fileList)
new QListWidgetItem(m_Icon, itemName(item), this);
- }
}
QString ContentTab::itemName(const QFileInfo &item)
diff --git a/examples/svg/embedded/desktopservices/desktopservices.pro b/examples/svg/embedded/desktopservices/desktopservices.pro
index 1410451..0ffcec5 100644
--- a/examples/svg/embedded/desktopservices/desktopservices.pro
+++ b/examples/svg/embedded/desktopservices/desktopservices.pro
@@ -11,11 +11,4 @@ music.files = data/*.mp3 data/*.wav
image.files = data/*.png
target.path = $$[QT_INSTALL_EXAMPLES]/svg/embedded/desktopservices
-
-wince*{
- music.path = "\\My Documents\\My Music"
- image.path = "\\My Documents\\My Pictures"
- DEPLOYMENT += music image
-}
-
INSTALLS += target
diff --git a/examples/svg/embedded/embedded.pro b/examples/svg/embedded/embedded.pro
index 42232fb..aebb72b 100644
--- a/examples/svg/embedded/embedded.pro
+++ b/examples/svg/embedded/embedded.pro
@@ -2,4 +2,4 @@ TEMPLATE = subdirs
qtHaveModule(widgets): SUBDIRS += desktopservices fluidlauncher weatherinfo
# Disable platforms without process support
-winrt: SUBDIRS -= fluidlauncher
+uikit|winrt: SUBDIRS -= fluidlauncher
diff --git a/examples/svg/embedded/fluidlauncher/config_wince/config.xml b/examples/svg/embedded/fluidlauncher/config_wince/config.xml
deleted file mode 100644
index 3b57770..0000000
--- a/examples/svg/embedded/fluidlauncher/config_wince/config.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<demolauncher>
- <demos>
- <example filename="embeddedsvgviewer" name="SVG Viewer" image="screenshots/embeddedsvgviewer.png" args="shapes.svg"/>
- <example filename="styledemo" name="Stylesheets" image="screenshots/styledemo.png"/>
- <example filename="deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/>
- <example filename="pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/>
- <example filename="wiggly" name="Wiggly Text" image="screenshots/wiggly.png"/>
- </demos>
- <slideshow timeout="60000" interval="10000">
- <imagedir dir="slides"/>
- </slideshow>
-</demolauncher>
diff --git a/examples/svg/embedded/fluidlauncher/fluidlauncher.pro b/examples/svg/embedded/fluidlauncher/fluidlauncher.pro
index 4046055..63cf1fa 100644
--- a/examples/svg/embedded/fluidlauncher/fluidlauncher.pro
+++ b/examples/svg/embedded/fluidlauncher/fluidlauncher.pro
@@ -19,38 +19,3 @@ RESOURCES = fluidlauncher.qrc
target.path = $$[QT_INSTALL_EXAMPLES]/svg/embedded/fluidlauncher
INSTALLS += target
-
-wince*{
- QT += svg
-
- BUILD_DIR = release
- if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
- BUILD_DIR = debug
- }
-
- requires(!isEmpty(_QMAKE_SUPER_CACHE_))
- base = $$dirname(_QMAKE_SUPER_CACHE_)
- baseex = $$base/qtbase/examples
- svgex = $$base/qtsvg/examples
- executables.files = \
- $$svgex/svg/embedded/embeddedsvgviewer/$${BUILD_DIR}/embeddedsvgviewer.exe \
- $$baseex/embedded/styleexample/$${BUILD_DIR}/styleexample.exe \
- $$baseex/painting/deform/$${BUILD_DIR}/deform.exe \
- $$baseex/painting/pathstroke/$${BUILD_DIR}/pathstroke.exe \
- $$baseex/graphicsview/elasticnodes/$${BUILD_DIR}/elasticnodes.exe \
- $$baseex/widgets/wiggly/$${BUILD_DIR}/wiggly.exe \
- $$baseex/painting/concentriccircles/$${BUILD_DIR}/concentriccircles.exe \
- $$baseex/draganddrop/$${BUILD_DIR}/fridgemagnets.exe
-
- executables.path = .
-
- files.files = $$PWD/screenshots $$PWD/slides $$PWD/../embeddedsvgviewer/shapes.svg
- files.path = .
-
- config.files = $$PWD/config_wince/config.xml
- config.path = .
-
- DEPLOYMENT += config files executables
-
- DEPLOYMENT_PLUGIN += qgif qjpeg qmng qsvg
-}
diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro
index 40d4a6c..a0d6793 100644
--- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro
+++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro
@@ -7,8 +7,3 @@ RESOURCES += embeddedsvgviewer.qrc
target.path = $$[QT_INSTALL_EXAMPLES]/svg/embeddedsvgviewer
INSTALLS += target
-
-wince* {
- DEPLOYMENT_PLUGIN += qsvg
-}
-
diff --git a/examples/svg/network/bearercloud/bearercloud.cpp b/examples/svg/network/bearercloud/bearercloud.cpp
index 1ec711e..bf2a444 100644
--- a/examples/svg/network/bearercloud/bearercloud.cpp
+++ b/examples/svg/network/bearercloud/bearercloud.cpp
@@ -113,17 +113,19 @@ void BearerCloud::cloudMoved()
void BearerCloud::timerEvent(QTimerEvent *)
{
- QList<Cloud *> clouds;
- foreach (QGraphicsItem *item, items()) {
+ std::vector<Cloud *> clouds;
+ const auto graphicsItems = items();
+ clouds.reserve(graphicsItems.size());
+ for (QGraphicsItem *item : graphicsItems) {
if (Cloud *cloud = qgraphicsitem_cast<Cloud *>(item))
- clouds << cloud;
+ clouds.push_back(cloud);
}
- foreach (Cloud *cloud, clouds)
+ for (Cloud *cloud : clouds)
cloud->calculateForces();
bool cloudsMoved = false;
- foreach (Cloud *cloud, clouds)
+ for (Cloud *cloud : clouds)
cloudsMoved |= cloud->advance();
if (!cloudsMoved) {
@@ -158,8 +160,13 @@ void BearerCloud::configurationAdded(const QNetworkConfiguration &config)
//! [3]
void BearerCloud::configurationRemoved(const QNetworkConfiguration &config)
{
- foreach (const QNetworkConfiguration::StateFlags &state, configStates.uniqueKeys())
- configStates.remove(state, config.identifier());
+ const auto id = config.identifier();
+ for (auto it = configStates.begin(), end = configStates.end(); it != end; /* erasing */) {
+ if (it.value() == id)
+ it = configStates.erase(it);
+ else
+ ++it;
+ }
Cloud *item = configurations.take(config.identifier());
@@ -173,10 +180,15 @@ void BearerCloud::configurationRemoved(const QNetworkConfiguration &config)
//! [4]
void BearerCloud::configurationChanged(const QNetworkConfiguration &config)
{
- foreach (const QNetworkConfiguration::StateFlags &state, configStates.uniqueKeys())
- configStates.remove(state, config.identifier());
+ const auto id = config.identifier();
+ for (auto it = configStates.begin(), end = configStates.end(); it != end; /* erasing */) {
+ if (it.value() == id)
+ it = configStates.erase(it);
+ else
+ ++it;
+ }
- configStates.insert(config.state(), config.identifier());
+ configStates.insert(config.state(), id);
cloudMoved();
}
@@ -185,10 +197,9 @@ void BearerCloud::configurationChanged(const QNetworkConfiguration &config)
//! [1]
void BearerCloud::updateConfigurations()
{
- QList<QNetworkConfiguration> allConfigurations = manager.allConfigurations();
-
- while (!allConfigurations.isEmpty())
- configurationAdded(allConfigurations.takeFirst());
+ const auto allConfigurations = manager.allConfigurations();
+ for (const QNetworkConfiguration &config : allConfigurations)
+ configurationAdded(config);
cloudMoved();
}
diff --git a/examples/svg/network/bearercloud/cloud.cpp b/examples/svg/network/bearercloud/cloud.cpp
index be6797f..fb5bfd2 100644
--- a/examples/svg/network/bearercloud/cloud.cpp
+++ b/examples/svg/network/bearercloud/cloud.cpp
@@ -108,7 +108,8 @@ void Cloud::calculateForces()
qreal xvel = 0;
qreal yvel = 0;
QLineF orbitForce;
- foreach (QGraphicsItem *item, scene()->items()) {
+ const auto graphicsItems = scene()->items();
+ for (QGraphicsItem *item : graphicsItems) {
// other clouds
Cloud *cloud = qgraphicsitem_cast<Cloud *>(item);
if (!cloud && item->data(0) != QLatin1String("This Device"))
@@ -245,7 +246,6 @@ void Cloud::stateChanged(QNetworkSession::State state)
else
finalOpacity = 1.0;
-#if !defined(Q_OS_WINCE)
QString tooltip;
if (configuration.name().isEmpty())
@@ -303,9 +303,6 @@ void Cloud::stateChanged(QNetworkSession::State state)
tooltip += tr("<br>Sent data: %1 bytes").arg(session->bytesWritten());
setToolTip(tooltip);
-#else
- Q_UNUSED(state);
-#endif
}
//! [2]
diff --git a/examples/svg/network/bearercloud/main.cpp b/examples/svg/network/bearercloud/main.cpp
index 62b6e88..a06b4ea 100644
--- a/examples/svg/network/bearercloud/main.cpp
+++ b/examples/svg/network/bearercloud/main.cpp
@@ -55,11 +55,6 @@ protected:
void resizeEvent(QResizeEvent *) {
fitInView(sceneRect(), Qt::KeepAspectRatio);
}
-#ifdef Q_OS_WINCE
- void hideEvent(QHideEvent *) {
- qApp->quit();
- }
-#endif
};
CloudView::CloudView(QGraphicsScene *scene)
@@ -67,9 +62,6 @@ CloudView::CloudView(QGraphicsScene *scene)
{
setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing |
QPainter::SmoothPixmapTransform);
-#if defined (Q_OS_WINCE)
- setWindowState(Qt::WindowMaximized);
-#endif
}
#include "main.moc"
diff --git a/examples/svg/opengl/framebufferobject/framebufferobject.pro b/examples/svg/opengl/framebufferobject/framebufferobject.pro
index dd3211f..d180d4d 100644
--- a/examples/svg/opengl/framebufferobject/framebufferobject.pro
+++ b/examples/svg/opengl/framebufferobject/framebufferobject.pro
@@ -1,4 +1,4 @@
-contains(QT_CONFIG, opengles2):error("This example is written for OpenGL 1.x")
+qtConfig(opengles2):error("This example is written for OpenGL 1.x")
QT += widgets opengl svg
diff --git a/examples/svg/opengl/opengl.pro b/examples/svg/opengl/opengl.pro
index 661015f..82c616c 100644
--- a/examples/svg/opengl/opengl.pro
+++ b/examples/svg/opengl/opengl.pro
@@ -1,2 +1,2 @@
TEMPLATE = subdirs
-qtHaveModule(widgets):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): SUBDIRS += framebufferobject
+qtHaveModule(widgets):!qtConfig(opengles2):!qtConfig(dynamicgl): SUBDIRS += framebufferobject
diff --git a/examples/svg/svg.pro b/examples/svg/svg.pro
index c828a95..410415b 100644
--- a/examples/svg/svg.pro
+++ b/examples/svg/svg.pro
@@ -3,4 +3,4 @@ TEMPLATE = subdirs
qtHaveModule(widgets): SUBDIRS += embeddedsvgviewer svggenerator svgviewer
SUBDIRS += embedded richtext draganddrop network
-qtHaveModule(opengl):!contains(QT_CONFIG, opengles2): SUBDIRS += opengl
+qtHaveModule(opengl):!qtConfig(opengles2): SUBDIRS += opengl
diff --git a/examples/svg/svgviewer/exportdialog.cpp b/examples/svg/svgviewer/exportdialog.cpp
index 04c9e12..b7cb96a 100644
--- a/examples/svg/svgviewer/exportdialog.cpp
+++ b/examples/svg/svgviewer/exportdialog.cpp
@@ -195,7 +195,8 @@ void ExportDialog::browse()
if (!fileName.isEmpty())
fileDialog.setDirectory(QFileInfo(fileName).absolutePath());
QStringList mimeTypes;
- foreach (const QByteArray &mimeType, QImageWriter::supportedMimeTypes())
+ const auto supportedMimeTypes = QImageWriter::supportedMimeTypes();
+ for (const QByteArray &mimeType : supportedMimeTypes)
mimeTypes.append(QLatin1String(mimeType));
fileDialog.setMimeTypeFilters(mimeTypes);
const int pngIndex = mimeTypes.indexOf("image/png");
diff --git a/examples/svg/svgviewer/svgviewer.pro b/examples/svg/svgviewer/svgviewer.pro
index 6eea56a..8f3ae05 100644
--- a/examples/svg/svgviewer/svgviewer.pro
+++ b/examples/svg/svgviewer/svgviewer.pro
@@ -15,9 +15,3 @@ CONFIG += console
# install
target.path = $$[QT_INSTALL_EXAMPLES]/svg/svgviewer
INSTALLS += target
-
-wince*: {
- addFiles.files = files\\*.svg
- addFiles.path = "\\My Documents"
- DEPLOYMENT += addFiles
-}
diff --git a/src/svg/qsvgfunctions_wince.cpp b/src/svg/qsvgfunctions_wince.cpp
deleted file mode 100644
index 2ef34a4..0000000
--- a/src/svg/qsvgfunctions_wince.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt SVG module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifdef _WIN32_WCE //Q_OS_WINCE
-
-#include <windows.h>
-#include <winbase.h>
-#include <kfuncs.h>
-#include <stdio.h>
-#if _WIN32_WCE < 0x800
-#include <altcecrt.h>
-#endif
-
-#include "qplatformdefs.h"
-#include "qsvgfunctions_wince_p.h"
-#include "qstring.h"
-#include "qbytearray.h"
-#include "qhash.h"
-
-QT_USE_NAMESPACE
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// File I/O ---------------------------------------------------------
-#if _WIN32_WCE < 0x800
-int errno = 0;
-
-int qt_wince_open(const char *filename, int oflag, int pmode)
-{
- QString fn(QString::fromLatin1(filename));
- return _wopen((wchar_t*)fn.utf16(), oflag, pmode);
-}
-
-int qt_wince__wopen(const wchar_t *filename, int oflag, int /*pmode*/)
-{
- wchar_t *flag;
-
- if (oflag & _O_APPEND) {
- if (oflag & _O_WRONLY) {
- flag = L"a";
- } else if (oflag & _O_RDWR) {
- flag = L"a+";
- }
- } else if (oflag & _O_BINARY) {
- if (oflag & _O_WRONLY) {
- flag = L"wb";
- } else if (oflag & _O_RDWR) {
- flag = L"w+b"; // slightly different from "r+" where the file must exist
- } else if (oflag & _O_RDONLY) {
- flag = L"rb";
- } else {
- flag = L"b";
- }
- } else {
- if (oflag & _O_WRONLY) {
- flag = L"wt";
- } else if (oflag & _O_RDWR) {
- flag = L"w+t"; // slightly different from "r+" where the file must exist
- } else if (oflag & _O_RDONLY) {
- flag = L"rt";
- } else {
- flag = L"t";
- }
- }
-
- int retval = (int)_wfopen(filename, flag);
- return (retval == NULL) ? -1 : retval;
-}
-
-long qt_wince__lseek(int handle, long offset, int origin)
-{
- return fseek((FILE*)handle, offset, origin);
-}
-
-int qt_wince__read(int handle, void *buffer, unsigned int count)
-{
- return fread(buffer, 1, count, (FILE*)handle);
-}
-
-int qt_wince__write(int handle, const void *buffer, unsigned int count)
-{
- return fwrite(buffer, 1, count, (FILE*)handle);
-}
-
-int qt_wince__close(int handle)
-{
- if (!handle)
- return 0;
- return fclose((FILE*)handle);
-}
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif // Q_OS_WINCE
diff --git a/src/svg/qsvgfunctions_wince_p.h b/src/svg/qsvgfunctions_wince_p.h
deleted file mode 100644
index eb3108d..0000000
--- a/src/svg/qsvgfunctions_wince_p.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt SVG module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSVGFUNCTIONS_WCE_P_H
-#define QSVGFUNCTIONS_WCE_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-
-#ifdef Q_OS_WINCE
-
-// File I/O ---------------------------------------------------------
-
-#define _O_RDONLY 0x0001
-#define _O_RDWR 0x0002
-#define _O_WRONLY 0x0004
-#define _O_CREAT 0x0008
-#define _O_TRUNC 0x0010
-#define _O_APPEND 0x0020
-#define _O_EXCL 0x0040
-
-#define O_RDONLY _O_RDONLY
-#define O_RDWR _O_RDWR
-#define O_WRONLY _O_WRONLY
-#define O_CREAT _O_CREAT
-#define O_TRUNC _O_TRUNC
-#define O_APPEND _O_APPEND
-#define O_EXCL _O_EXCL
-
-//For zlib we need these helper functions, but they break the build when
-//set globally, so just set them for zlib use
-#ifdef ZLIB_H
-#define open qt_wince_open
-#define _wopen(a,b,c) qt_wince__wopen(a,b,c)
-#define close qt_wince__close
-#define lseek qt_wince__lseek
-#define read qt_wince__read
-#define write qt_wince__write
-#endif
-
-int qt_wince__wopen(const wchar_t *filename, int oflag, int pmode);
-int qt_wince_open(const char *filename, int oflag, int pmode);
-int qt_wince__close(int handle);
-long qt_wince__lseek(int handle, long offset, int origin);
-int qt_wince__read(int handle, void *buffer, unsigned int count);
-int qt_wince__write(int handle, const void *buffer, unsigned int count);
-
-#endif // Q_OS_WINCE
-#endif // QSVGFUNCTIONS_WCE_P_H
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index 0abd403..6bca27f 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -284,12 +284,8 @@ public:
}
}
- for (QGradientStop stop : qAsConst(stops)) {
- QString color =
- QString::fromLatin1("#%1%2%3")
- .arg(stop.second.red(), 2, 16, QLatin1Char('0'))
- .arg(stop.second.green(), 2, 16, QLatin1Char('0'))
- .arg(stop.second.blue(), 2, 16, QLatin1Char('0'));
+ for (const QGradientStop &stop : qAsConst(stops)) {
+ const QString color = stop.second.name(QColor::HexRgb);
str << QLatin1String(" <stop offset=\"")<< stop.first << QLatin1String("\" ")
<< QLatin1String("stop-color=\"") << color << QLatin1String("\" ")
<< QLatin1String("stop-opacity=\"") << stop.second.alphaF() <<QLatin1String("\" />\n");
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index 103bbea..f9e43b0 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -36,21 +36,9 @@ SOURCES += \
qgraphicssvgitem.cpp \
qsvggenerator.cpp
-wince*: {
- SOURCES += \
- qsvgfunctions_wince.cpp
- HEADERS += \
- qsvgfunctions_wince_p.h
-}
-
-contains(QT_CONFIG, system-zlib) {
- if(unix|mingw): LIBS_PRIVATE += -lz
- else {
- isEmpty(ZLIB_LIBS): LIBS += zdll.lib
- else: LIBS += $$ZLIB_LIBS
- }
-} else {
+qtConfig(system-zlib): \
+ QMAKE_USE_PRIVATE += zlib
+else: \
QT_PRIVATE += zlib-private
-}
load(qt_module)
diff --git a/tests/auto/qicon_svg/qicon_svg.pro b/tests/auto/qicon_svg/qicon_svg.pro
index 5e24892..a0558fd 100644
--- a/tests/auto/qicon_svg/qicon_svg.pro
+++ b/tests/auto/qicon_svg/qicon_svg.pro
@@ -5,7 +5,4 @@ QT += svg testlib gui-private
SOURCES += tst_qicon_svg.cpp
RESOURCES = tst_qicon_svg.qrc
-wince* {
- DEPLOYMENT_PLUGIN += qsvg
-}
TESTDATA += icons/*
diff --git a/tests/auto/qsvggenerator/qsvggenerator.pro b/tests/auto/qsvggenerator/qsvggenerator.pro
index 73149ae..fd0edfa 100644
--- a/tests/auto/qsvggenerator/qsvggenerator.pro
+++ b/tests/auto/qsvggenerator/qsvggenerator.pro
@@ -4,14 +4,4 @@ QT += svg xml testlib widgets gui-private
SOURCES += tst_qsvggenerator.cpp
-wince* {
- addFiles.files = referenceSvgs
- addFiles.path = .
- DEPLOYMENT += addFiles
-}
-
-wince* {
- DEFINES += SRCDIR=\\\"\\\"
-} else {
- DEFINES += SRCDIR=\\\"$$PWD/\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
index db7e3e5..4795b55 100644
--- a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
+++ b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
@@ -99,10 +99,14 @@ static void compareWithoutFontInfo(const QByteArray &source, const QByteArray &r
QDomDocument referenceDoc;
referenceDoc.setContent(reference);
- QList<QString> fontAttributes;
- fontAttributes << "font-family" << "font-size" << "font-weight" << "font-style";
-
- foreach (QString attribute, fontAttributes) {
+ const QString fontAttributes[] = {
+ "font-family",
+ "font-size",
+ "font-weight",
+ "font-style",
+ };
+
+ for (const QString &attribute : fontAttributes) {
removeAttribute(sourceDoc, attribute);
removeAttribute(referenceDoc, attribute);
}
diff --git a/tests/auto/qsvgrenderer/qsvgrenderer.pro b/tests/auto/qsvgrenderer/qsvgrenderer.pro
index 42e5ccd..d1173ae 100644
--- a/tests/auto/qsvgrenderer/qsvgrenderer.pro
+++ b/tests/auto/qsvgrenderer/qsvgrenderer.pro
@@ -5,14 +5,4 @@ QT += svg testlib widgets gui-private
SOURCES += tst_qsvgrenderer.cpp
RESOURCES += resources.qrc
-wince* {
- addFiles.files = *.svg *.svgz
- addFiles.path = .
-
- DEPLOYMENT += addFiles
- wince*|qt_not_deployed {
- DEPLOYMENT_PLUGIN += qsvg
- }
-}
-
DEFINES += SRCDIR=\\\"$$PWD/\\\"