Merge remote-tracking branch 'gerrit/master' into containers

Conflicts:
	src/corelib/tools/qstring.cpp

Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb

1 files changed, 0 insertions, 37 deletions

diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h
index 1afef3d3ac..11be47ce64 100644
--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@@ -9,8 +9,6 @@ QT_CLASS_LIB(QVariantAnimation, QtCore, qvariantanimation.h)
 QT_CLASS_LIB(QTextCodec, QtCore, qtextcodec.h)
 QT_CLASS_LIB(QTextEncoder, QtCore, qtextcodec.h)
 QT_CLASS_LIB(QTextDecoder, QtCore, qtextcodec.h)
-QT_CLASS_LIB(QTextCodecFactoryInterface, QtCore, qtextcodecplugin.h)
-QT_CLASS_LIB(QTextCodecPlugin, QtCore, qtextcodecplugin.h)
 QT_CLASS_LIB(QFuture, QtCore, qfuture.h)
 QT_CLASS_LIB(QFutureIterator, QtCore, qfuture.h)
 QT_CLASS_LIB(QMutableFutureIterator, QtCore, qfuture.h)
@@ -35,26 +33,13 @@ QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
 QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
 QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
 QT_CLASS_LIB(QNoImplicitBoolCast, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_INT8, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_UINT8, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_INT16, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_UINT16, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_INT32, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_UINT32, QtCore, qglobal.h)
 QT_CLASS_LIB(Q_INT64, QtCore, qglobal.h)
 QT_CLASS_LIB(Q_UINT64, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_LLONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_ULLONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
 QT_CLASS_LIB(QSysInfo, QtCore, qglobal.h)
 QT_CLASS_LIB(QtMsgHandler, QtCore, qglobal.h)
 QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
 QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
 QT_CLASS_LIB(QGlobalStaticDeleter, QtCore, qglobal.h)
-QT_CLASS_LIB(QBool, QtCore, qglobal.h)
 QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
 QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
 QT_CLASS_LIB(QFlag, QtCore, qglobal.h)
@@ -397,8 +382,6 @@ QT_CLASS_LIB(QXmlStreamStringRef, QtXml, qxmlstream.h)
 QT_CLASS_LIB(QXmlStreamWriter, QtXml, qxmlstream.h)
 QT_CLASS_LIB(QNetworkCacheMetaData, QtNetwork, qabstractnetworkcache.h)
 QT_CLASS_LIB(QAbstractNetworkCache, QtNetwork, qabstractnetworkcache.h)
-QT_CLASS_LIB(QHttpHeader, QtNetwork, qhttpheader_p.h)
-QT_CLASS_LIB(QHttpResponseHeader, QtNetwork, qhttpheader_p.h)
 QT_CLASS_LIB(QNetworkAccessManager, QtNetwork, qnetworkaccessmanager.h)
 QT_CLASS_LIB(QNetworkCookie, QtNetwork, qnetworkcookie.h)
 QT_CLASS_LIB(QNetworkCookieJar, QtNetwork, qnetworkcookiejar.h)
@@ -675,7 +658,6 @@ QT_CLASS_LIB(QGraphicsView, QtWidgets, qgraphicsview.h)
 QT_CLASS_LIB(QGraphicsWidget, QtWidgets, qgraphicswidget.h)
 QT_CLASS_LIB(QBitmap, QtGui, qbitmap.h)
 QT_CLASS_LIB(QIcon, QtWidgets, qicon.h)
-QT_CLASS_LIB(QIconSet, QtWidgets, qicon.h)
 QT_CLASS_LIB(QIconEngine, QtWidgets, qiconengine.h)
 QT_CLASS_LIB(QIconEngineV2, QtWidgets, qiconengine.h)
 QT_CLASS_LIB(QIconEngineFactoryInterface, QtWidgets, qiconengineplugin.h)
@@ -696,10 +678,6 @@ QT_CLASS_LIB(QPictureFormatInterface, QtGui, qpictureformatplugin.h)
 QT_CLASS_LIB(QPictureFormatPlugin, QtGui, qpictureformatplugin.h)
 QT_CLASS_LIB(QPixmap, QtGui, qpixmap.h)
 QT_CLASS_LIB(QPixmapCache, QtGui, qpixmapcache.h)
-QT_CLASS_LIB(QInputContext, QtWidgets, qinputcontext.h)
-QT_CLASS_LIB(QInputContextFactory, QtWidgets, qinputcontextfactory.h)
-QT_CLASS_LIB(QInputContextFactoryInterface, QtWidgets, qinputcontextplugin.h)
-QT_CLASS_LIB(QInputContextPlugin, QtWidgets, qinputcontextplugin.h)
 QT_CLASS_LIB(QAbstractItemDelegate, QtWidgets, qabstractitemdelegate.h)
 QT_CLASS_LIB(QAbstractItemView, QtWidgets, qabstractitemview.h)
 QT_CLASS_LIB(QAbstractProxyModel, QtWidgets, qabstractproxymodel.h)
@@ -871,19 +849,6 @@ QT_CLASS_LIB(QRgb, QtGui, qrgb.h)
 QT_CLASS_LIB(QStylePainter, QtGui, qstylepainter.h)
 QT_CLASS_LIB(QTransform, QtGui, qtransform.h)
 QT_CLASS_LIB(QWMatrix, QtGui, qwmatrix.h)
-QT_CLASS_LIB(QS60MainApplicationBase, QtGui, qs60mainapplication.h)
-QT_CLASS_LIB(QS60MainApplicationBase, QtWidgets, qs60mainapplication.h)
-QT_CLASS_LIB(QS60MainApplication, QtWidgets, qs60mainapplication.h)
-QT_CLASS_LIB(QS60MainAppUiBase, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60StubAknAppUiBase, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60StubMEikStatusPaneObserver, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60StubMAknTouchPaneObserver, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60StubAknAppUi, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60MainAppUiBase, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60MainAppUi, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60MainDocumentBase, QtWidgets, qs60maindocument.h)
-QT_CLASS_LIB(QS60MainDocumentBase, QtWidgets, qs60maindocument.h)
-QT_CLASS_LIB(QS60MainDocument, QtWidgets, qs60maindocument.h)
 QT_CLASS_LIB(QKeyEventTransition, QtWidgets, qkeyeventtransition.h)
 QT_CLASS_LIB(QMouseEventTransition, QtWidgets, qmouseeventtransition.h)
 QT_CLASS_LIB(QCDEStyle, QtWidgets, qcdestyle.h)
@@ -894,7 +859,6 @@ QT_CLASS_LIB(QMacStyle, QtWidgets, qmacstyle_mac.h)
 QT_CLASS_LIB(QMotifStyle, QtWidgets, qmotifstyle.h)
 QT_CLASS_LIB(QPlastiqueStyle, QtWidgets, qplastiquestyle.h)
 QT_CLASS_LIB(QProxyStyle, QtWidgets, qproxystyle.h)
-QT_CLASS_LIB(QS60Style, QtWidgets, qs60style.h)
 QT_CLASS_LIB(QStyle, QtWidgets, qstyle.h)
 QT_CLASS_LIB(QStyleFactory, QtWidgets, qstylefactory.h)
 QT_CLASS_LIB(QStyleOption, QtWidgets, qstyleoption.h)
@@ -946,7 +910,6 @@ QT_CLASS_LIB(QWindowsMobileStyle, QtWidgets, qwindowsmobilestyle.h)
 QT_CLASS_LIB(QWindowsStyle, QtWidgets, qwindowsstyle.h)
 QT_CLASS_LIB(QWindowsVistaStyle, QtWidgets, qwindowsvistastyle.h)
 QT_CLASS_LIB(QWindowsXPStyle, QtWidgets, qwindowsxpstyle.h)
-QT_CLASS_LIB(QSymbianEvent, QtGui, qsymbianevent.h)
 QT_CLASS_LIB(QFontEngineInfo, QtGui, qabstractfontengine_qws.h)
 QT_CLASS_LIB(QFontEngineFactoryInterface, QtGui, qabstractfontengine_qws.h)
 QT_CLASS_LIB(QFontEnginePlugin, QtGui, qabstractfontengine_qws.h)