diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/plugins.pro | 4 | ||||
| -rw-r--r-- | src/svg/qsvgfunctions_wince.cpp | 134 | ||||
| -rw-r--r-- | src/svg/qsvgfunctions_wince_p.h | 95 | ||||
| -rw-r--r-- | src/svg/qsvggenerator.cpp | 8 | ||||
| -rw-r--r-- | src/svg/svg.pro | 18 |
5 files changed, 7 insertions, 252 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 3965957..6be129a 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -load(qfeatures) -!contains(QT_DISABLED_FEATURES, imageformatplugin): SUBDIRS += imageformats +QT_FOR_CONFIG += gui +qtConfig(imageformatplugin): SUBDIRS += imageformats SUBDIRS += iconengines 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 f19be78..5829a1a 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) |