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>

src/xml/stream/qxmlstream.h

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

src/xml/stream/stream.pri

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

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

tests/auto/selftests/tst_selftests.cpp

@@ -42,7 +42,7 @@
 
 #include <QtCore>
 #include <QtTest/QtTest>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 #include <private/cycle_p.h>
 
 class tst_Selftests: public QObject

tools/uilib/abstractformbuilder.cpp

@@ -82,7 +82,7 @@
 #  include <private/qlayout_p.h> // Compiling within Designer
 #endif
 
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 
 #include <QtGui/QDialog>