Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: Ib22f7e4aad77af52f9d9a57a87b5e6d039c7e18b

10 files changed, 18 insertions, 227 deletions

diff --git a/src/svg/doc/qtsvg.qdocconf b/src/svg/doc/qtsvg.qdocconf
index e562f69..b8e3132 100644
--- a/src/svg/doc/qtsvg.qdocconf
+++ b/src/svg/doc/qtsvg.qdocconf
@@ -1,4 +1,3 @@
-include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtSvg
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index 96f3df3..09cda2a 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -49,8 +49,6 @@
 
 #include <QtSvg/qtsvgglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -98,8 +96,6 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QT_NO_WIDGETS
 
 #endif // QGRAPHICSSVGITEM_H
diff --git a/src/svg/qsvgfunctions_wince.cpp b/src/svg/qsvgfunctions_wince.cpp
index f3aa204..59f7157 100644
--- a/src/svg/qsvgfunctions_wince.cpp
+++ b/src/svg/qsvgfunctions_wince.cpp
@@ -47,7 +47,7 @@
 #include <altcecrt.h>
 
 #include "qplatformdefs.h"
-#include "qfunctions_wince.h"
+#include "qfunctions_wince_p.h"
 #include "qstring.h"
 #include "qbytearray.h"
 #include "qhash.h"
diff --git a/src/svg/qsvgfunctions_wince.h b/src/svg/qsvgfunctions_wince_p.h
index 4cc9064..e8b770c 100644
--- a/src/svg/qsvgfunctions_wince.h
+++ b/src/svg/qsvgfunctions_wince_p.h
@@ -39,8 +39,21 @@
 **
 ****************************************************************************/
 
-#ifndef QSVGFUNCTIONS_WCE_H
-#define QSVGFUNCTIONS_WCE_H
+#ifndef QSVGFUNCTIONS_WCE_P_H
+#define QSVGFUNCTIONS_WCE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qglobal.h>
 
 #ifdef Q_OS_WINCE
 
@@ -81,4 +94,4 @@ int qt_wince__read(int handle, void *buffer, unsigned int count);
 int qt_wince__write(int handle, const void *buffer, unsigned int count);
 
 #endif // Q_OS_WINCE
-#endif // QSVGFUNCTIONS_WCE_H
+#endif // QSVGFUNCTIONS_WCE_P_H
diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h
index 8b88ca6..44e9ced 100644
--- a/src/svg/qsvggenerator.h
+++ b/src/svg/qsvggenerator.h
@@ -52,8 +52,6 @@
 #include <QtCore/qscopedpointer.h>
 #include <QtSvg/qtsvgglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -106,7 +104,5 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QT_NO_SVGGENERATOR
 #endif // QSVGGENERATOR_H
diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h
index 6b12a30..395f093 100644
--- a/src/svg/qsvgrenderer.h
+++ b/src/svg/qsvgrenderer.h
@@ -52,8 +52,6 @@
 #include <QtCore/qxmlstream.h>
 #include <QtSvg/qtsvgglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -114,7 +112,5 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QT_NO_SVGRENDERER
 #endif // QSVGRENDERER_H
diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h
index 560bace..e91b974 100644
--- a/src/svg/qsvgwidget.h
+++ b/src/svg/qsvgwidget.h
@@ -50,8 +50,6 @@
 
 #include <QtSvg/qtsvgglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -82,8 +80,6 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QT_NO_WIDGETS
 
 #endif // QSVGWIDGET_H
diff --git a/src/svg/qtsvgglobal.h b/src/svg/qtsvgglobal.h
index ace2053..3779679 100644
--- a/src/svg/qtsvgglobal.h
+++ b/src/svg/qtsvgglobal.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 #ifndef Q_SVG_EXPORT
@@ -62,6 +60,4 @@ QT_BEGIN_NAMESPACE
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index 8ee9061..ee18997 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -41,7 +41,7 @@ wince*: {
     SOURCES += \
         qsvgfunctions_wince.cpp
     HEADERS += \
-        qsvgfunctions_wince.h
+        qsvgfunctions_wince_p.h
 }
 
 contains(QT_CONFIG, system-zlib) {
diff --git a/tests/auto/bic/data/QtSvg.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSvg.5.0.0.linux-gcc-ia32.txt
index 85f36ab..af48e90 100644
--- a/tests/auto/bic/data/QtSvg.5.0.0.linux-gcc-ia32.txt
+++ b/tests/auto/bic/data/QtSvg.5.0.0.linux-gcc-ia32.txt
@@ -4203,157 +4203,6 @@ QAccessibleTableModelChangeEvent (0xb3adfca8) 0
   QAccessibleEvent (0xb380ea48) 0
       primary-for QAccessibleTableModelChangeEvent (0xb3adfca8)
 
-Vtable for QAccessibleTextInterface
-QAccessibleTextInterface::_ZTV24QAccessibleTextInterface: 20u entries
-0     (int (*)(...))0
-4     (int (*)(...))(& _ZTI24QAccessibleTextInterface)
-8     (int (*)(...))QAccessibleTextInterface::~QAccessibleTextInterface
-12    (int (*)(...))QAccessibleTextInterface::~QAccessibleTextInterface
-16    (int (*)(...))__cxa_pure_virtual
-20    (int (*)(...))__cxa_pure_virtual
-24    (int (*)(...))__cxa_pure_virtual
-28    (int (*)(...))__cxa_pure_virtual
-32    (int (*)(...))__cxa_pure_virtual
-36    (int (*)(...))__cxa_pure_virtual
-40    (int (*)(...))__cxa_pure_virtual
-44    (int (*)(...))__cxa_pure_virtual
-48    (int (*)(...))QAccessibleTextInterface::textBeforeOffset
-52    (int (*)(...))QAccessibleTextInterface::textAfterOffset
-56    (int (*)(...))QAccessibleTextInterface::textAtOffset
-60    (int (*)(...))__cxa_pure_virtual
-64    (int (*)(...))__cxa_pure_virtual
-68    (int (*)(...))__cxa_pure_virtual
-72    (int (*)(...))__cxa_pure_virtual
-76    (int (*)(...))__cxa_pure_virtual
-
-Class QAccessibleTextInterface
-   size=4 align=4
-   base size=4 base align=4
-QAccessibleTextInterface (0xb3821038) 0 nearly-empty
-    vptr=((& QAccessibleTextInterface::_ZTV24QAccessibleTextInterface) + 8u)
-
-Vtable for QAccessibleEditableTextInterface
-QAccessibleEditableTextInterface::_ZTV32QAccessibleEditableTextInterface: 7u entries
-0     (int (*)(...))0
-4     (int (*)(...))(& _ZTI32QAccessibleEditableTextInterface)
-8     (int (*)(...))QAccessibleEditableTextInterface::~QAccessibleEditableTextInterface
-12    (int (*)(...))QAccessibleEditableTextInterface::~QAccessibleEditableTextInterface
-16    (int (*)(...))__cxa_pure_virtual
-20    (int (*)(...))__cxa_pure_virtual
-24    (int (*)(...))__cxa_pure_virtual
-
-Class QAccessibleEditableTextInterface
-   size=4 align=4
-   base size=4 base align=4
-QAccessibleEditableTextInterface (0xb38212a0) 0 nearly-empty
-    vptr=((& QAccessibleEditableTextInterface::_ZTV32QAccessibleEditableTextInterface) + 8u)
-
-Vtable for QAccessibleValueInterface
-QAccessibleValueInterface::_ZTV25QAccessibleValueInterface: 9u entries
-0     (int (*)(...))0
-4     (int (*)(...))(& _ZTI25QAccessibleValueInterface)
-8     (int (*)(...))QAccessibleValueInterface::~QAccessibleValueInterface
-12    (int (*)(...))QAccessibleValueInterface::~QAccessibleValueInterface
-16    (int (*)(...))__cxa_pure_virtual
-20    (int (*)(...))__cxa_pure_virtual
-24    (int (*)(...))__cxa_pure_virtual
-28    (int (*)(...))__cxa_pure_virtual
-32    (int (*)(...))__cxa_pure_virtual
-
-Class QAccessibleValueInterface
-   size=4 align=4
-   base size=4 base align=4
-QAccessibleValueInterface (0xb3821508) 0 nearly-empty
-    vptr=((& QAccessibleValueInterface::_ZTV25QAccessibleValueInterface) + 8u)
-
-Vtable for QAccessibleTableCellInterface
-QAccessibleTableCellInterface::_ZTV29QAccessibleTableCellInterface: 13u entries
-0     (int (*)(...))0
-4     (int (*)(...))(& _ZTI29QAccessibleTableCellInterface)
-8     (int (*)(...))QAccessibleTableCellInterface::~QAccessibleTableCellInterface
-12    (int (*)(...))QAccessibleTableCellInterface::~QAccessibleTableCellInterface
-16    (int (*)(...))__cxa_pure_virtual
-20    (int (*)(...))__cxa_pure_virtual
-24    (int (*)(...))__cxa_pure_virtual
-28    (int (*)(...))__cxa_pure_virtual
-32    (int (*)(...))__cxa_pure_virtual
-36    (int (*)(...))__cxa_pure_virtual
-40    (int (*)(...))__cxa_pure_virtual
-44    (int (*)(...))__cxa_pure_virtual
-48    (int (*)(...))__cxa_pure_virtual
-
-Class QAccessibleTableCellInterface
-   size=4 align=4
-   base size=4 base align=4
-QAccessibleTableCellInterface (0xb3821770) 0 nearly-empty
-    vptr=((& QAccessibleTableCellInterface::_ZTV29QAccessibleTableCellInterface) + 8u)
-
-Vtable for QAccessibleTableInterface
-QAccessibleTableInterface::_ZTV25QAccessibleTableInterface: 23u entries
-0     (int (*)(...))0
-4     (int (*)(...))(& _ZTI25QAccessibleTableInterface)
-8     (int (*)(...))QAccessibleTableInterface::~QAccessibleTableInterface
-12    (int (*)(...))QAccessibleTableInterface::~QAccessibleTableInterface
-16    (int (*)(...))__cxa_pure_virtual
-20    (int (*)(...))__cxa_pure_virtual
-24    (int (*)(...))__cxa_pure_virtual
-28    (int (*)(...))__cxa_pure_virtual
-32    (int (*)(...))__cxa_pure_virtual
-36    (int (*)(...))__cxa_pure_virtual
-40    (int (*)(...))__cxa_pure_virtual
-44    (int (*)(...))__cxa_pure_virtual
-48    (int (*)(...))__cxa_pure_virtual
-52    (int (*)(...))__cxa_pure_virtual
-56    (int (*)(...))__cxa_pure_virtual
-60    (int (*)(...))__cxa_pure_virtual
-64    (int (*)(...))__cxa_pure_virtual
-68    (int (*)(...))__cxa_pure_virtual
-72    (int (*)(...))__cxa_pure_virtual
-76    (int (*)(...))__cxa_pure_virtual
-80    (int (*)(...))__cxa_pure_virtual
-84    (int (*)(...))__cxa_pure_virtual
-88    (int (*)(...))__cxa_pure_virtual
-
-Class QAccessibleTableInterface
-   size=4 align=4
-   base size=4 base align=4
-QAccessibleTableInterface (0xb38219d8) 0 nearly-empty
-    vptr=((& QAccessibleTableInterface::_ZTV25QAccessibleTableInterface) + 8u)
-
-Vtable for QAccessibleActionInterface
-QAccessibleActionInterface::_ZTV26QAccessibleActionInterface: 9u entries
-0     (int (*)(...))0
-4     (int (*)(...))(& _ZTI26QAccessibleActionInterface)
-8     (int (*)(...))QAccessibleActionInterface::~QAccessibleActionInterface
-12    (int (*)(...))QAccessibleActionInterface::~QAccessibleActionInterface
-16    (int (*)(...))__cxa_pure_virtual
-20    (int (*)(...))QAccessibleActionInterface::localizedActionName
-24    (int (*)(...))QAccessibleActionInterface::localizedActionDescription
-28    (int (*)(...))__cxa_pure_virtual
-32    (int (*)(...))__cxa_pure_virtual
-
-Class QAccessibleActionInterface
-   size=4 align=4
-   base size=4 base align=4
-QAccessibleActionInterface (0xb3821c40) 0 nearly-empty
-    vptr=((& QAccessibleActionInterface::_ZTV26QAccessibleActionInterface) + 8u)
-
-Vtable for QAccessibleImageInterface
-QAccessibleImageInterface::_ZTV25QAccessibleImageInterface: 7u entries
-0     (int (*)(...))0
-4     (int (*)(...))(& _ZTI25QAccessibleImageInterface)
-8     (int (*)(...))QAccessibleImageInterface::~QAccessibleImageInterface
-12    (int (*)(...))QAccessibleImageInterface::~QAccessibleImageInterface
-16    (int (*)(...))__cxa_pure_virtual
-20    (int (*)(...))__cxa_pure_virtual
-24    (int (*)(...))__cxa_pure_virtual
-
-Class QAccessibleImageInterface
-   size=4 align=4
-   base size=4 base align=4
-QAccessibleImageInterface (0xb3821f88) 0 nearly-empty
-    vptr=((& QAccessibleImageInterface::_ZTV25QAccessibleImageInterface) + 8u)
-
 Vtable for QAccessibleBridge
 QAccessibleBridge::_ZTV17QAccessibleBridge: 6u entries
 0     (int (*)(...))0
@@ -6308,56 +6157,6 @@ QRegExpValidator (0xb2e64bf4) 0
     QObject (0xb28f9460) 0
         primary-for QValidator (0xb2e64c30)
 
-Vtable for QAccessibleWidget
-QAccessibleWidget::_ZTV17QAccessibleWidget: 35u entries
-0     (int (*)(...))0
-4     (int (*)(...))(& _ZTI17QAccessibleWidget)
-8     (int (*)(...))QAccessibleWidget::~QAccessibleWidget
-12    (int (*)(...))QAccessibleWidget::~QAccessibleWidget
-16    (int (*)(...))QAccessibleObject::isValid
-20    (int (*)(...))QAccessibleObject::object
-24    (int (*)(...))QAccessibleWidget::window
-28    (int (*)(...))QAccessibleWidget::relations
-32    (int (*)(...))QAccessibleWidget::focusChild
-36    (int (*)(...))QAccessibleObject::childAt
-40    (int (*)(...))QAccessibleWidget::parent
-44    (int (*)(...))QAccessibleWidget::child
-48    (int (*)(...))QAccessibleWidget::childCount
-52    (int (*)(...))QAccessibleWidget::indexOfChild
-56    (int (*)(...))QAccessibleWidget::text
-60    (int (*)(...))QAccessibleObject::setText
-64    (int (*)(...))QAccessibleWidget::rect
-68    (int (*)(...))QAccessibleWidget::role
-72    (int (*)(...))QAccessibleWidget::state
-76    (int (*)(...))QAccessibleWidget::foregroundColor
-80    (int (*)(...))QAccessibleWidget::backgroundColor
-84    (int (*)(...))QAccessibleInterface::virtual_hook
-88    (int (*)(...))QAccessibleWidget::interface_cast
-92    (int (*)(...))QAccessibleWidget::actionNames
-96    (int (*)(...))QAccessibleWidget::doAction
-100   (int (*)(...))QAccessibleWidget::keyBindingsForAction
-104   (int (*)(...))-0x00000000000000008
-108   (int (*)(...))(& _ZTI17QAccessibleWidget)
-112   (int (*)(...))QAccessibleWidget::_ZThn8_N17QAccessibleWidgetD1Ev
-116   (int (*)(...))QAccessibleWidget::_ZThn8_N17QAccessibleWidgetD0Ev
-120   (int (*)(...))QAccessibleWidget::_ZThn8_NK17QAccessibleWidget11actionNamesEv
-124   (int (*)(...))QAccessibleActionInterface::localizedActionName
-128   (int (*)(...))QAccessibleActionInterface::localizedActionDescription
-132   (int (*)(...))QAccessibleWidget::_ZThn8_N17QAccessibleWidget8doActionERK7QString
-136   (int (*)(...))QAccessibleWidget::_ZThn8_NK17QAccessibleWidget20keyBindingsForActionERK7QString
-
-Class QAccessibleWidget
-   size=16 align=4
-   base size=16 base align=4
-QAccessibleWidget (0xb28fa300) 0
-    vptr=((& QAccessibleWidget::_ZTV17QAccessibleWidget) + 8u)
-  QAccessibleObject (0xb2e64c6c) 0
-      primary-for QAccessibleWidget (0xb28fa300)
-    QAccessibleInterface (0xb28f9d90) 0 nearly-empty
-        primary-for QAccessibleObject (0xb2e64c6c)
-  QAccessibleActionInterface (0xb28f9dc8) 8 nearly-empty
-      vptr=((& QAccessibleWidget::_ZTV17QAccessibleWidget) + 112u)
-
 Class QSizePolicy
    size=4 align=4
    base size=4 base align=4