diff options
-rw-r--r-- | examples/svg/embedded/desktopservices/desktopservices.pro | 7 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/config_wince/config.xml | 13 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/fluidlauncher.pro | 35 | ||||
-rw-r--r-- | examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro | 5 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/cloud.cpp | 4 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/main.cpp | 8 | ||||
-rw-r--r-- | examples/svg/svgviewer/svgviewer.pro | 6 | ||||
-rw-r--r-- | src/svg/qsvgfunctions_wince.cpp | 134 | ||||
-rw-r--r-- | src/svg/svg.pro | 7 | ||||
-rw-r--r-- | tests/auto/qicon_svg/qicon_svg.pro | 4 | ||||
-rw-r--r-- | tests/auto/qsvggenerator/qsvggenerator.pro | 12 | ||||
-rw-r--r-- | tests/auto/qsvgrenderer/qsvgrenderer.pro | 10 |
12 files changed, 1 insertions, 244 deletions
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/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/cloud.cpp b/examples/svg/network/bearercloud/cloud.cpp index be6797f..936c03a 100644 --- a/examples/svg/network/bearercloud/cloud.cpp +++ b/examples/svg/network/bearercloud/cloud.cpp @@ -245,7 +245,6 @@ void Cloud::stateChanged(QNetworkSession::State state) else finalOpacity = 1.0; -#if !defined(Q_OS_WINCE) QString tooltip; if (configuration.name().isEmpty()) @@ -303,9 +302,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/svgviewer/svgviewer.pro b/examples/svg/svgviewer/svgviewer.pro index 157af4d..1b4764c 100644 --- a/examples/svg/svgviewer/svgviewer.pro +++ b/examples/svg/svgviewer/svgviewer.pro @@ -13,9 +13,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/svg.pro b/src/svg/svg.pro index 83e76b7..8cee04f 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -37,13 +37,6 @@ 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 { diff --git a/tests/auto/qicon_svg/qicon_svg.pro b/tests/auto/qicon_svg/qicon_svg.pro index ab45a49..5c8e0be 100644 --- a/tests/auto/qicon_svg/qicon_svg.pro +++ b/tests/auto/qicon_svg/qicon_svg.pro @@ -5,8 +5,4 @@ QT += testlib gui-private SOURCES += tst_qicon_svg.cpp RESOURCES = tst_qicon_svg.qrc -wince* { - QT += svg - 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/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/\\\" |