AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Symbian specific code in 3rdparty.

Browse Source 
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 <lars.knoll@nokia.com>
This commit is contained in:
Xizhi Zhu 2012-01-23 18:45:45 +01:00 committed by Qt by Nokia
parent 41a5ca3559
commit 755cd58f9c
4 changed files with 4 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/3rdparty/libjpeg.pri vendored
View File

@ -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
}

4
src/3rdparty/libpng/pngpriv.h vendored
View File

@ -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 <windows.h> /* defines _WINDOWS_ macro */
# endif
# include <windows.h> /* defines _WINDOWS_ macro */
#endif
/* Moved here around 1.5.0beta36 from pngconf.h */

95
src/3rdparty/s60/eiksoftkeyimage.h vendored
View File

@ -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

5
src/3rdparty/zlib_dependency.pri vendored
View File

@ -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
}