diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-08-11 15:17:40 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-11 16:21:14 +0200 |
commit | f2b3dfd1f17952627fce9fde1264207958f87f43 (patch) | |
tree | 709de3ece52333ded455f69e341af106e2c2c402 /src | |
parent | 96d987edac0bbbb1a02382eae3389d75b655406b (diff) |
QXmlStream lives in QtCore
We can finally remove the hack where a copy of QXmlStream
was compiled into QtXml on some platforms.
Change-Id: Ia164caa73dfb470ac86d1b4062031093b433d10c
Reviewed-on: http://codereview.qt.nokia.com/2869
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/xml/stream/qxmlstream.h | 73 | ||||
-rw-r--r-- | src/xml/stream/stream.pri | 9 | ||||
-rw-r--r-- | src/xml/xml.pro | 1 |
3 files changed, 0 insertions, 83 deletions
diff --git a/src/xml/stream/qxmlstream.h b/src/xml/stream/qxmlstream.h deleted file mode 100644 index 7023ab236b..0000000000 --- a/src/xml/stream/qxmlstream.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtXml 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 OLD_QXMLSTREAM_H -#define OLD_QXMLSTREAM_H - -#include <QtCore/qxmlstream.h> - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Xml) - -#if 0 -// make syncqt generate forwarding headers for this file too -#pragma qt_class(QXmlStreamAttribute) -#pragma qt_class(QXmlStreamAttributes) -#pragma qt_class(QXmlStreamEntityDeclaration) -#pragma qt_class(QXmlStreamEntityDeclarations) -#pragma qt_class(QXmlStreamEntityResolver) -#pragma qt_class(QXmlStreamNamespaceDeclaration) -#pragma qt_class(QXmlStreamNamespaceDeclarations) -#pragma qt_class(QXmlStreamNotationDeclaration) -#pragma qt_class(QXmlStreamNotationDeclarations) -#pragma qt_class(QXmlStreamReader) -#pragma qt_class(QXmlStreamStringRef) -#pragma qt_class(QXmlStreamWriter) -#endif - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // OLD_QXMLSTREAM_H diff --git a/src/xml/stream/stream.pri b/src/xml/stream/stream.pri deleted file mode 100644 index a5ba3a22fa..0000000000 --- a/src/xml/stream/stream.pri +++ /dev/null @@ -1,9 +0,0 @@ -# compatibility header: -HEADERS += stream/qxmlstream.h - -!static { - # The platforms that require the symbol to be present in QtXml: - win32:!wince-*:SOURCES += ../corelib/xml/qxmlstream.cpp - mac:SOURCES += ../corelib/xml/qxmlstream.cpp - aix-*:SOURCES += ../corelib/xml/qxmlstream.cpp -} diff --git a/src/xml/xml.pro b/src/xml/xml.pro index f1d2baca50..a764fa6094 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -25,6 +25,5 @@ win32-borland { include(dom/dom.pri) include(sax/sax.pri) -include(stream/stream.pri) symbian:TARGET.UID3=0x2001B2E0 |