diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-10 13:33:13 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-10 13:43:10 +0000 |
commit | eab19a6eb3894170fcf3a91609d952d4e0335bb0 (patch) | |
tree | 0dd25d4ec04d52665695704aeb7ba952193ba403 | |
parent | d1f2a865397416fa1ae1596d33f83f74730365f1 (diff) |
Remove Windows CE.
Remove #ifdef sections for Q_OS_WINCE, wince .pro file clauses and
the CE-specific file qfunctions_wince.cpp.
Task-number: QTBUG-51673
Change-Id: I839d6fa07e1929da2e2f2115bfc8aa670b3a117f
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
-rw-r--r-- | src/3rdparty/libtiff.pri | 1 | ||||
-rw-r--r-- | src/plugins/imageformats/imageformats.pro | 2 | ||||
-rw-r--r-- | src/plugins/imageformats/mng/qmnghandler.cpp | 6 | ||||
-rw-r--r-- | src/plugins/imageformats/tiff/qfunctions_wince.cpp | 66 | ||||
-rw-r--r-- | src/plugins/imageformats/tiff/tiff.pro | 1 | ||||
-rw-r--r-- | tests/auto/tiff/tst_qtiff.cpp | 4 |
6 files changed, 0 insertions, 80 deletions
diff --git a/src/3rdparty/libtiff.pri b/src/3rdparty/libtiff.pri index 51f4e0a..c57c668 100644 --- a/src/3rdparty/libtiff.pri +++ b/src/3rdparty/libtiff.pri @@ -35,7 +35,6 @@ SOURCES += \ $$PWD/libtiff/libtiff/tif_zip.c \ $$PWD/libtiff/port/snprintf.c -wince*: SOURCES += $$PWD/libtiff/libtiff/tif_win32.c win32: SOURCES += $$PWD/libtiff/libtiff/tif_win32.c else: SOURCES += $$PWD/libtiff/libtiff/tif_unix.c android: SOURCES += $$PWD/libtiff/port/lfind.c diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index 1ed399a..5d6e716 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -10,8 +10,6 @@ SUBDIRS = \ config_jasper: SUBDIRS += jp2 config_libmng: SUBDIRS += mng -wince:SUBDIRS -= jp2 - winrt { SUBDIRS -= tiff \ tga diff --git a/src/plugins/imageformats/mng/qmnghandler.cpp b/src/plugins/imageformats/mng/qmnghandler.cpp index 2f1abd0..4106ba6 100644 --- a/src/plugins/imageformats/mng/qmnghandler.cpp +++ b/src/plugins/imageformats/mng/qmnghandler.cpp @@ -101,13 +101,7 @@ static mng_bool myerror(mng_handle /*hMNG*/, static mng_ptr myalloc(mng_size_t iSize) { -#if defined(Q_OS_WINCE) - mng_ptr ptr = malloc(iSize); - memset(ptr, 0, iSize); - return ptr; -#else return (mng_ptr)calloc(1, iSize); -#endif } static void myfree(mng_ptr pPtr, mng_size_t /*iSize*/) diff --git a/src/plugins/imageformats/tiff/qfunctions_wince.cpp b/src/plugins/imageformats/tiff/qfunctions_wince.cpp deleted file mode 100644 index fcd5a3f..0000000 --- a/src/plugins/imageformats/tiff/qfunctions_wince.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins 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 "qplatformdefs.h" - -QT_USE_NAMESPACE - -#ifdef __cplusplus -extern "C" { -#endif - -void *lfind(const void* key, const void* base, size_t* elements, size_t size, - int (__cdecl *compare)(const void*, const void*)) -{ - const char* current = (char*) base; - const char* const end = (char*) (current + (*elements) * size); - while (current != end) { - if (compare(current, key) == 0) - return (void*)current; - current += size; - } - return 0; -} - - -#ifdef __cplusplus -} // extern "C" -#endif -#endif // Q_OS_WINCE diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro index 0f841ab..81b2a96 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro @@ -6,7 +6,6 @@ load(qt_plugin) HEADERS += qtiffhandler_p.h SOURCES += main.cpp qtiffhandler.cpp -wince*: SOURCES += qfunctions_wince.cpp OTHER_FILES += tiff.json config_libtiff { diff --git a/tests/auto/tiff/tst_qtiff.cpp b/tests/auto/tiff/tst_qtiff.cpp index ae7d5a5..8e3d0c9 100644 --- a/tests/auto/tiff/tst_qtiff.cpp +++ b/tests/auto/tiff/tst_qtiff.cpp @@ -404,10 +404,6 @@ void tst_qtiff::readWriteNonDestructive() void tst_qtiff::largeTiff() { -#if defined(Q_OS_WINCE) - QSKIP("not tested on WinCE"); -#endif - QImage img(4096, 2048, QImage::Format_ARGB32_Premultiplied); QPainter p(&img); |