From 755cd58f9c70eba0c67da8b2b504fd7a07a2c4e2 Mon Sep 17 00:00:00 2001 From: Xizhi Zhu Date: Mon, 23 Jan 2012 18:45:45 +0100 Subject: [PATCH] Remove Symbian specific code in 3rdparty. Symbian specific code in libtiff was added by commit 6ddf09085f1e8a3cc83c4ee0c77c433d26819c35 in Qt4, code in libpng was added by commit 66fb4038649cfd1d660204bf7c70f99a409ede4f in Qt4, so they are removed. Symbian specific code in freetype was copied from upstream, so kept untouched. Change-Id: I74f169d9283eefd91ec2e97cbd1b8f03dc449380 Reviewed-by: Lars Knoll --- src/3rdparty/libjpeg.pri | 5 +- src/3rdparty/libpng/pngpriv.h | 4 +- src/3rdparty/s60/eiksoftkeyimage.h | 95 ------------------------------ src/3rdparty/zlib_dependency.pri | 5 +- 4 files changed, 4 insertions(+), 105 deletions(-) delete mode 100644 src/3rdparty/s60/eiksoftkeyimage.h diff --git a/src/3rdparty/libjpeg.pri b/src/3rdparty/libjpeg.pri index 63f2aca5dc..5896a53942 100644 --- a/src/3rdparty/libjpeg.pri +++ b/src/3rdparty/libjpeg.pri @@ -5,10 +5,7 @@ wince*: { } #Disable warnings in 3rdparty code due to unused arguments -symbian: { - QMAKE_CXXFLAGS.CW += -W nounusedarg - TARGET.UID3=0x2001E61B -} else:contains(QMAKE_CC, gcc): { +contains(QMAKE_CC, gcc): { QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main } diff --git a/src/3rdparty/libpng/pngpriv.h b/src/3rdparty/libpng/pngpriv.h index 9b90f26801..e248ad8bbe 100644 --- a/src/3rdparty/libpng/pngpriv.h +++ b/src/3rdparty/libpng/pngpriv.h @@ -179,9 +179,7 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp; #if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \ defined(_WIN32) || defined(__WIN32__) -# if !defined(__SYMBIAN32__) -# include /* defines _WINDOWS_ macro */ -# endif +# include /* defines _WINDOWS_ macro */ #endif /* Moved here around 1.5.0beta36 from pngconf.h */ diff --git a/src/3rdparty/s60/eiksoftkeyimage.h b/src/3rdparty/s60/eiksoftkeyimage.h deleted file mode 100644 index 56f0d241ab..0000000000 --- a/src/3rdparty/s60/eiksoftkeyimage.h +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef EIKSOFTKEYIMAGE_H -#define EIKSOFTKEYIMAGE_H - -// FORWARD DECLARATIONS -class CEikButtonGroupContainer; - -// CLASS DECLARATION - -/** -* Changes cba button's label to image. -* -* @lib EIKCOCTL -* @since 2.0 -*/ -class EikSoftkeyImage - { - public: - - /** - * Set image to cba button by replacing label - * @since 2.0 - * @param aButtonGroupContainer Button container - * @param aImage Image to button, - * Takes Images ownership - * @param aLeft Boolean: left or right button. - * If true, then change left, - * if false, change right - */ - IMPORT_C static void SetImage(CEikButtonGroupContainer* aButtonGroupContainer, CEikImage& aImage, TBool aLeft); - - /** - * Change to cba button image back to label - * @since 2.0 - * @param aButtonGroupContainer Button container - * @param aLeft Boolean: left or right button. - * If true, then change left, - * if false, change right - */ - IMPORT_C static void SetLabel(CEikButtonGroupContainer* aButtonGroupContainer, TBool aLeft); - - private: - - /** - * C++ default constructor. - */ - EikSoftkeyImage() {}; - - - }; - -#endif // EIKSOFTKEYIMAGE_H - -// End of File - diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri index 042eb1373f..75dd2396f2 100644 --- a/src/3rdparty/zlib_dependency.pri +++ b/src/3rdparty/zlib_dependency.pri @@ -1,8 +1,7 @@ # zlib dependency satisfied by bundled 3rd party zlib or system zlib contains(QT_CONFIG, system-zlib) { - symbian: LIBS_PRIVATE += -llibz - else:if(unix|win32-g++*):LIBS_PRIVATE += -lz - else: LIBS += zdll.lib + if(unix|win32-g++*):LIBS_PRIVATE += -lz + else: LIBS += zdll.lib } else { INCLUDEPATH += $$PWD/zlib }