diff --git a/scripts/genmap.py b/scripts/genmap.py
index 5fbdd63be..92b609a19 100755
--- a/scripts/genmap.py
+++ b/scripts/genmap.py
@@ -8,13 +8,10 @@ components = {
     'DBus': 'Q_DBUS_EXPORT',
     'Declarative': 'Q_DECLARATIVE_EXPORT',
     'Designer': 'QDESIGNER_COMPONENTS_EXPORT|QDESIGNER_EXTENSION_EXPORT|QT_FORMEDITOR_EXPORT|QT_PROPERTYEDITOR_EXPORT|QT_SIGNALSLOTEDITOR_EXPORT|QT_OBJECTINSPECTOR_EXPORT|QT_WIDGETBOX_EXPORT|QT_BUDDYEDITOR_EXPORT|QT_TABORDEREDITOR_EXPORT|QT_TASKMENU_EXPORT',
-    'Help': 'Q_HELP_EXPORT',
-    'Multimedia': 'Q_MULTIMEDIA_EXPORT',
     'Network': 'Q_NETWORK_EXPORT',
     'Sql': 'Q_SQL_EXPORT',
     'Svg': 'Q_SVG_EXPORT',
     'Xml': 'Q_XML_EXPORT',
-    'XmlPatterns': 'Q_XMLPATTERNS_EXPORT',
     'Script': 'Q_SCRIPT_EXPORT',
     'ScriptTools': 'Q_SCRIPTTOOLS_EXPORT',
     'Test': 'Q_TEST_EXPORT',
diff --git a/src/shared/qclass_lib_map.h b/src/shared/qclass_lib_map.h
index 7a888f3f5..c032206d8 100644
--- a/src/shared/qclass_lib_map.h
+++ b/src/shared/qclass_lib_map.h
@@ -35,193 +35,46 @@ static const ClassInfoEntry qclass_lib_map[] = {
     { "QXmlLexicalHandler", "QtXml/qxml.h"},
     { "QXmlDeclHandler", "QtXml/qxml.h"},
     { "QXmlDefaultHandler", "QtXml/qxml.h"},
-    { "QTextCodec", "QtCore/qtextcodec.h"},
-    { "ConverterState", "QtCore/qtextcodec.h"},
-    { "QTextEncoder", "QtCore/qtextcodec.h"},
-    { "QTextDecoder", "QtCore/qtextcodec.h"},
-    { "QTextCodecFactoryInterface", "QtCore/qtextcodecplugin.h"},
-    { "QTextCodecPlugin", "QtCore/qtextcodecplugin.h"},
-    { "QXmlStreamStringRef", "QtCore/qxmlstream.h"},
-    { "QXmlStreamAttribute", "QtCore/qxmlstream.h"},
-    { "QXmlStreamAttributes", "QtCore/qxmlstream.h"},
-    { "QXmlStreamNamespaceDeclaration", "QtCore/qxmlstream.h"},
-    { "QXmlStreamNotationDeclaration", "QtCore/qxmlstream.h"},
-    { "QXmlStreamEntityDeclaration", "QtCore/qxmlstream.h"},
-    { "QXmlStreamEntityResolver", "QtCore/qxmlstream.h"},
-    { "QXmlStreamReader", "QtCore/qxmlstream.h"},
-    { "QXmlStreamWriter", "QtCore/qxmlstream.h"},
-    { "QFutureInterfaceBase", "QtCore/qfutureinterface.h"},
-    { "QFutureWatcherBase", "QtCore/qfuturewatcher.h"},
-    { "Exception", "QtCore/qtconcurrentexception.h"},
-    { "UnhandledException", "QtCore/qtconcurrentexception.h"},
-    { "ExceptionStore", "QtCore/qtconcurrentexception.h"},
-    { "BlockSizeManager", "QtCore/qtconcurrentiteratekernel.h"},
-    { "ResultIteratorBase", "QtCore/qtconcurrentresultstore.h"},
-    { "ResultStoreBase", "QtCore/qtconcurrentresultstore.h"},
-    { "ThreadEngineBase", "QtCore/qtconcurrentthreadengine.h"},
-    { "QThreadPool", "QtCore/qthreadpool.h"},
-    { "QBitArray", "QtCore/qbitarray.h"},
-    { "QBitRef", "QtCore/qbitarray.h"},
-    { "QByteArray", "QtCore/qbytearray.h"},
-    { "QByteRef", "QtCore/qbytearray.h"},
-    { "QByteArrayMatcher", "QtCore/qbytearraymatcher.h"},
-    { "QChar", "QtCore/qchar.h"},
-    { "QCommandLineOption", "QtCore/qcommandlineoption.h"},
-    { "QCommandLineParser", "QtCore/qcommandlineparser.h"},
-    { "QContiguousCacheData", "QtCore/qcontiguouscache.h"},
-    { "QCryptographicHash", "QtCore/qcryptographichash.h"},
-    { "QDate", "QtCore/qdatetime.h"},
-    { "QTime", "QtCore/qdatetime.h"},
-    { "QDateTime", "QtCore/qdatetime.h"},
-    { "QEasingCurve", "QtCore/qeasingcurve.h"},
-    { "QElapsedTimer", "QtCore/qelapsedtimer.h"},
-    { "QHashData", "QtCore/qhash.h"},
-    { "QLine", "QtCore/qline.h"},
-    { "QLineF", "QtCore/qline.h"},
-    { "QLinkedListData", "QtCore/qlinkedlist.h"},
-    { "QListData", "QtCore/qlist.h"},
-    { "QSystemLocale", "QtCore/qlocale.h"},
-    { "QLocale", "QtCore/qlocale.h"},
-    { "QMapData", "QtCore/qmap.h"},
-    { "QPoint", "QtCore/qpoint.h"},
-    { "QPointF", "QtCore/qpoint.h"},
-    { "QRect", "QtCore/qrect.h"},
-    { "QRectF", "QtCore/qrect.h"},
-    { "QRegExp", "QtCore/qregexp.h"},
-    { "QSharedData", "QtCore/qshareddata.h"},
-    { "QSize", "QtCore/qsize.h"},
-    { "QSizeF", "QtCore/qsize.h"},
-    { "QString", "QtCore/qstring.h"},
-    { "QLatin1String", "QtCore/qstring.h"},
-    { "QCharRef", "QtCore/qstring.h"},
-    { "QStringRef", "QtCore/qstring.h"},
-    { "QAbstractConcatenable", "QtCore/qstringbuilder.h"},
-    { "QStringList", "QtCore/qstringlist.h"},
-    { "QStringMatcher", "QtCore/qstringmatcher.h"},
-    { "QTextBoundaryFinder", "QtCore/qtextboundaryfinder.h"},
-    { "QTimeLine", "QtCore/qtimeline.h"},
-    { "QVectorData", "QtCore/qvector.h"},
-    { "QAtomicInt", "QtCore/qatomic.h"},
-    { "QAtomicPointer", "QtCore/qatomic.h"},
-    { "QMutex", "QtCore/qmutex.h"},
-    { "QMutexLocker", "QtCore/qmutex.h"},
-    { "QReadWriteLock", "QtCore/qreadwritelock.h"},
-    { "QReadLocker", "QtCore/qreadwritelock.h"},
-    { "QWriteLocker", "QtCore/qreadwritelock.h"},
-    { "QSemaphore", "QtCore/qsemaphore.h"},
-    { "QThread", "QtCore/qthread.h"},
-    { "QThreadStorageData", "QtCore/qthreadstorage.h"},
-    { "QWaitCondition", "QtCore/qwaitcondition.h"},
-    { "QFactoryInterface", "QtCore/qfactoryinterface.h"},
-    { "QLibrary", "QtCore/qlibrary.h"},
-    { "QPluginLoader", "QtCore/qpluginloader.h"},
-    { "QUuid", "QtCore/quuid.h"},
-    { "QAbstractAnimation", "QtCore/qabstractanimation.h"},
-    { "QAnimationDriver", "QtCore/qabstractanimation.h"},
-    { "QAnimationGroup", "QtCore/qanimationgroup.h"},
-    { "QParallelAnimationGroup", "QtCore/qparallelanimationgroup.h"},
-    { "QPauseAnimation", "QtCore/qpauseanimation.h"},
-    { "QPropertyAnimation", "QtCore/qpropertyanimation.h"},
-    { "QSequentialAnimationGroup", "QtCore/qsequentialanimationgroup.h"},
-    { "QVariantAnimation", "QtCore/qvariantanimation.h"},
-    { "QLibraryInfo", "QtCore/qlibraryinfo.h"},
-    { "QInternal", "QtCore/qnamespace.h"},
-    { "QJsonArray", "QtCore/qjsonarray.h"},
-    { "QJsonParseError", "QtCore/qjsondocument.h"},
-    { "QJsonDocument", "QtCore/qjsondocument.h"},
-    { "QJsonObject", "QtCore/qjsonobject.h"},
-    { "QJsonValue", "QtCore/qjsonvalue.h"},
-    { "QJsonValueRef", "QtCore/qjsonvalue.h"},
-    { "QJsonValueRefPtr", "QtCore/qjsonvalue.h"},
-    { "QJsonValuePtr", "QtCore/qjsonvalue.h"},
-    { "QAbstractFileEngine", "QtCore/qabstractfileengine.h"},
-    { "QAbstractFileEngineHandler", "QtCore/qabstractfileengine.h"},
-    { "QAbstractFileEngineIterator", "QtCore/qabstractfileengine.h"},
-    { "QBuffer", "QtCore/qbuffer.h"},
-    { "QDataStream", "QtCore/qdatastream.h"},
-    { "QDebug", "QtCore/qdebug.h"},
-    { "QDir", "QtCore/qdir.h"},
-    { "QDirIterator", "QtCore/qdiriterator.h"},
-    { "QFile", "QtCore/qfile.h"},
-    { "QFileInfo", "QtCore/qfileinfo.h"},
-    { "QFileSystemWatcher", "QtCore/qfilesystemwatcher.h"},
-    { "QFSFileEngine", "QtCore/qfsfileengine.h"},
-    { "QIODevice", "QtCore/qiodevice.h"},
-    { "QProcessEnvironment", "QtCore/qprocess.h"},
-    { "QProcess", "QtCore/qprocess.h"},
-    { "QResource", "QtCore/qresource.h"},
-    { "QSettings", "QtCore/qsettings.h"},
-    { "QStandardPaths", "QtCore/qstandardpaths.h"},
-    { "QTemporaryFile", "QtCore/qtemporaryfile.h"},
-    { "QTextStream", "QtCore/qtextstream.h"},
-    { "QTextStreamManipulator", "QtCore/qtextstream.h"},
-    { "QUrl", "QtCore/qurl.h"},
-    { "QAbstractEventDispatcher", "QtCore/qabstracteventdispatcher.h"},
-    { "QModelIndex", "QtCore/qabstractitemmodel.h"},
-    { "QPersistentModelIndex", "QtCore/qabstractitemmodel.h"},
-    { "QAbstractItemModel", "QtCore/qabstractitemmodel.h"},
-    { "QAbstractTableModel", "QtCore/qabstractitemmodel.h"},
-    { "QAbstractListModel", "QtCore/qabstractitemmodel.h"},
-    { "QBasicTimer", "QtCore/qbasictimer.h"},
-    { "QCoreApplication", "QtCore/qcoreapplication.h"},
-    { "QEvent", "QtCore/qcoreevent.h"},
-    { "QTimerEvent", "QtCore/qcoreevent.h"},
-    { "QChildEvent", "QtCore/qcoreevent.h"},
-    { "QDynamicPropertyChangeEvent", "QtCore/qcoreevent.h"},
-    { "QEventLoop", "QtCore/qeventloop.h"},
-    { "QMetaMethod", "QtCore/qmetaobject.h"},
-    { "QMetaEnum", "QtCore/qmetaobject.h"},
-    { "QMetaProperty", "QtCore/qmetaobject.h"},
-    { "QMetaClassInfo", "QtCore/qmetaobject.h"},
-    { "QMetaType", "QtCore/qmetatype.h"},
-    { "QMimeData", "QtCore/qmimedata.h"},
-    { "QObject", "QtCore/qobject.h"},
-    { "QObjectUserData", "QtCore/qobject.h"},
-    { "QObjectCleanupHandler", "QtCore/qobjectcleanuphandler.h"},
-    { "QGenericArgument", "QtCore/qobjectdefs.h"},
-    { "QGenericReturnArgument", "QtCore/qobjectdefs.h"},
-    { "QMetaObject", "QtCore/qobjectdefs.h"},
-    { "QSharedMemory", "QtCore/qsharedmemory.h"},
-    { "QSignalMapper", "QtCore/qsignalmapper.h"},
-    { "QSocketNotifier", "QtCore/qsocketnotifier.h"},
-    { "QSystemSemaphore", "QtCore/qsystemsemaphore.h"},
-    { "QTimer", "QtCore/qtimer.h"},
-    { "QTranslator", "QtCore/qtranslator.h"},
-    { "QVariant", "QtCore/qvariant.h"},
-    { "QDesignerComponents", "QtDesigner/qdesigner_components.h"},
-    { "ActionProviderBase", "QtDesigner/default_actionprovider.h"},
-    { "QToolBarActionProvider", "QtDesigner/default_actionprovider.h"},
-    { "QMenuBarActionProvider", "QtDesigner/default_actionprovider.h"},
-    { "QMenuActionProvider", "QtDesigner/default_actionprovider.h"},
-    { "FormEditor", "QtDesigner/formeditor.h"},
-    { "FormWindow", "QtDesigner/formwindow.h"},
-    { "FormWindowWidgetStack", "QtDesigner/formwindow_widgetstack.h"},
-    { "FormWindowCursor", "QtDesigner/formwindowcursor.h"},
-    { "FormWindowManager", "QtDesigner/formwindowmanager.h"},
-    { "IconCache", "QtDesigner/iconcache.h"},
-    { "QDesignerResource", "QtDesigner/qdesigner_resource.h"},
-    { "QtBrushManager", "QtDesigner/qtbrushmanager.h"},
-    { "WidgetHandle", "QtDesigner/widgetselection.h"},
-    { "WidgetSelection", "QtDesigner/widgetselection.h"},
-    { "NewDynamicPropertyDialog", "QtDesigner/newdynamicpropertydialog.h"},
-    { "PaletteEditorButton", "QtDesigner/paletteeditorbutton.h"},
-    { "PropertyEditor", "QtDesigner/propertyeditor.h"},
-    { "StringListEditorButton", "QtDesigner/stringlisteditorbutton.h"},
-    { "SignalSlotEditor", "QtDesigner/signalsloteditor.h"},
-    { "SignalSlotEditorPlugin", "QtDesigner/signalsloteditor_plugin.h"},
-    { "SignalSlotEditorTool", "QtDesigner/signalsloteditor_tool.h"},
-    { "ObjectInspector", "QtDesigner/objectinspector.h"},
-    { "WidgetBox", "QtDesigner/widgetbox.h"},
-    { "WidgetBoxDnDItem", "QtDesigner/widgetbox_dnditem.h"},
-    { "BuddyEditor", "QtDesigner/buddyeditor.h"},
-    { "BuddyEditorPlugin", "QtDesigner/buddyeditor_plugin.h"},
-    { "BuddyEditorTool", "QtDesigner/buddyeditor_tool.h"},
-    { "TabOrderEditor", "QtDesigner/tabordereditor.h"},
-    { "TabOrderEditorPlugin", "QtDesigner/tabordereditor_plugin.h"},
-    { "TabOrderEditorTool", "QtDesigner/tabordereditor_tool.h"},
-    { "TaskMenuComponent", "QtDesigner/taskmenu_component.h"},
-    { "QExtensionFactory", "QtDesigner/default_extensionfactory.h"},
-    { "QExtensionManager", "QtDesigner/qextensionmanager.h"},
+    { "QAbstractSocket", "QtNetwork/qabstractsocket.h"},
+    { "QLocalServer", "QtNetwork/qlocalserver.h"},
+    { "QLocalSocket", "QtNetwork/qlocalsocket.h"},
+    { "QTcpServer", "QtNetwork/qtcpserver.h"},
+    { "QTcpSocket", "QtNetwork/qtcpsocket.h"},
+    { "QUdpSocket", "QtNetwork/qudpsocket.h"},
+    { "QNetworkConfigurationManager", "QtNetwork/qnetworkconfigmanager.h"},
+    { "QNetworkConfiguration", "QtNetwork/qnetworkconfiguration.h"},
+    { "QNetworkSession", "QtNetwork/qnetworksession.h"},
+    { "QAuthenticator", "QtNetwork/qauthenticator.h"},
+    { "QIPv6Address", "QtNetwork/qhostaddress.h"},
+    { "QHostAddress", "QtNetwork/qhostaddress.h"},
+    { "QHostInfo", "QtNetwork/qhostinfo.h"},
+    { "QNetworkAddressEntry", "QtNetwork/qnetworkinterface.h"},
+    { "QNetworkInterface", "QtNetwork/qnetworkinterface.h"},
+    { "QNetworkProxyQuery", "QtNetwork/qnetworkproxy.h"},
+    { "QNetworkProxy", "QtNetwork/qnetworkproxy.h"},
+    { "QNetworkProxyFactory", "QtNetwork/qnetworkproxy.h"},
+    { "QUrlInfo", "QtNetwork/qurlinfo.h"},
+    { "QNetworkCacheMetaData", "QtNetwork/qabstractnetworkcache.h"},
+    { "QAbstractNetworkCache", "QtNetwork/qabstractnetworkcache.h"},
+    { "QFtp", "QtNetwork/qftp.h"},
+    { "QHttpHeader", "QtNetwork/qhttp.h"},
+    { "QHttpResponseHeader", "QtNetwork/qhttp.h"},
+    { "QHttpRequestHeader", "QtNetwork/qhttp.h"},
+    { "QHttp", "QtNetwork/qhttp.h"},
+    { "QHttpPart", "QtNetwork/qhttpmultipart.h"},
+    { "QHttpMultiPart", "QtNetwork/qhttpmultipart.h"},
+    { "QNetworkAccessManager", "QtNetwork/qnetworkaccessmanager.h"},
+    { "QNetworkCookie", "QtNetwork/qnetworkcookie.h"},
+    { "QNetworkCookieJar", "QtNetwork/qnetworkcookiejar.h"},
+    { "QNetworkDiskCache", "QtNetwork/qnetworkdiskcache.h"},
+    { "QNetworkReply", "QtNetwork/qnetworkreply.h"},
+    { "QNetworkRequest", "QtNetwork/qnetworkrequest.h"},
+    { "QSslCertificate", "QtNetwork/qsslcertificate.h"},
+    { "QSslCipher", "QtNetwork/qsslcipher.h"},
+    { "QSslConfiguration", "QtNetwork/qsslconfiguration.h"},
+    { "QSslError", "QtNetwork/qsslerror.h"},
+    { "QSslKey", "QtNetwork/qsslkey.h"},
+    { "QSslSocket", "QtNetwork/qsslsocket.h"},
     { "QScriptable", "QtScript/qscriptable.h"},
     { "QScriptClass", "QtScript/qscriptclass.h"},
     { "QScriptClassPropertyIterator", "QtScript/qscriptclasspropertyiterator.h"},
@@ -614,55 +467,197 @@ static const ClassInfoEntry qclass_lib_map[] = {
     { "QProgressDialog", "QtGui/qprogressdialog.h"},
     { "QWizard", "QtGui/qwizard.h"},
     { "QWizardPage", "QtGui/qwizard.h"},
-    { "QScriptEngineDebugger", "QtScriptTools/qscriptenginedebugger.h"},
-    { "QDeclarativeComponent", "QtDeclarative/qdeclarativecomponent.h"},
-    { "QDeclarativeContext", "QtDeclarative/qdeclarativecontext.h"},
-    { "QDeclarativeEngine", "QtDeclarative/qdeclarativeengine.h"},
-    { "QDeclarativeError", "QtDeclarative/qdeclarativeerror.h"},
-    { "QDeclarativeExpression", "QtDeclarative/qdeclarativeexpression.h"},
-    { "QDeclarativeExtensionInterface", "QtDeclarative/qdeclarativeextensioninterface.h"},
-    { "QDeclarativeExtensionPlugin", "QtDeclarative/qdeclarativeextensionplugin.h"},
-    { "QDeclarativeImageProvider", "QtDeclarative/qdeclarativeimageprovider.h"},
-    { "QDeclarativeInfo", "QtDeclarative/qdeclarativeinfo.h"},
-    { "QDeclarativeListReference", "QtDeclarative/qdeclarativelist.h"},
-    { "QDeclarativeNetworkAccessManagerFactory", "QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h"},
-    { "QDeclarativeParserStatus", "QtDeclarative/qdeclarativeparserstatus.h"},
-    { "QDeclarativeProperty", "QtDeclarative/qdeclarativeproperty.h"},
-    { "QDeclarativePropertyValueInterceptor", "QtDeclarative/qdeclarativepropertyvalueinterceptor.h"},
-    { "QDeclarativePropertyValueSource", "QtDeclarative/qdeclarativepropertyvaluesource.h"},
-    { "QDeclarativeScriptString", "QtDeclarative/qdeclarativescriptstring.h"},
-    { "QDeclarativeItem", "QtDeclarative/qdeclarativeitem.h"},
-    { "QDeclarativePropertyMap", "QtDeclarative/qdeclarativepropertymap.h"},
-    { "QDeclarativeView", "QtDeclarative/qdeclarativeview.h"},
-    { "QGLFormat", "QtOpenGL/qgl.h"},
-    { "QGLContext", "QtOpenGL/qgl.h"},
-    { "QGLWidget", "QtOpenGL/qgl.h"},
-    { "QGLBuffer", "QtOpenGL/qglbuffer.h"},
-    { "QGLColormap", "QtOpenGL/qglcolormap.h"},
-    { "QGLFramebufferObject", "QtOpenGL/qglframebufferobject.h"},
-    { "QGLFramebufferObjectFormat", "QtOpenGL/qglframebufferobject.h"},
-    { "QGLFunctions", "QtOpenGL/qglfunctions.h"},
-    { "QGLPixelBuffer", "QtOpenGL/qglpixelbuffer.h"},
-    { "QGLShader", "QtOpenGL/qglshaderprogram.h"},
-    { "QGLShaderProgram", "QtOpenGL/qglshaderprogram.h"},
-    { "QSqlQueryModel", "QtSql/qsqlquerymodel.h"},
-    { "QSqlRelation", "QtSql/qsqlrelationaltablemodel.h"},
-    { "QSqlRelationalTableModel", "QtSql/qsqlrelationaltablemodel.h"},
-    { "QSqlTableModel", "QtSql/qsqltablemodel.h"},
-    { "QSqlDriverCreatorBase", "QtSql/qsqldatabase.h"},
-    { "QSqlDatabase", "QtSql/qsqldatabase.h"},
-    { "QSqlDriver", "QtSql/qsqldriver.h"},
-    { "QSqlDriverFactoryInterface", "QtSql/qsqldriverplugin.h"},
-    { "QSqlDriverPlugin", "QtSql/qsqldriverplugin.h"},
-    { "QSqlError", "QtSql/qsqlerror.h"},
-    { "QSqlField", "QtSql/qsqlfield.h"},
-    { "QSqlIndex", "QtSql/qsqlindex.h"},
-    { "QSqlQuery", "QtSql/qsqlquery.h"},
-    { "QSqlRecord", "QtSql/qsqlrecord.h"},
-    { "QSqlResult", "QtSql/qsqlresult.h"},
     { "QBenchmarkIterationController", "QtTest/qbenchmark.h"},
     { "QTestData", "QtTest/qtestdata.h"},
     { "QTestEventLoop", "QtTest/qtesteventloop.h"},
+    { "QTextCodec", "QtCore/qtextcodec.h"},
+    { "ConverterState", "QtCore/qtextcodec.h"},
+    { "QTextEncoder", "QtCore/qtextcodec.h"},
+    { "QTextDecoder", "QtCore/qtextcodec.h"},
+    { "QTextCodecFactoryInterface", "QtCore/qtextcodecplugin.h"},
+    { "QTextCodecPlugin", "QtCore/qtextcodecplugin.h"},
+    { "QXmlStreamStringRef", "QtCore/qxmlstream.h"},
+    { "QXmlStreamAttribute", "QtCore/qxmlstream.h"},
+    { "QXmlStreamAttributes", "QtCore/qxmlstream.h"},
+    { "QXmlStreamNamespaceDeclaration", "QtCore/qxmlstream.h"},
+    { "QXmlStreamNotationDeclaration", "QtCore/qxmlstream.h"},
+    { "QXmlStreamEntityDeclaration", "QtCore/qxmlstream.h"},
+    { "QXmlStreamEntityResolver", "QtCore/qxmlstream.h"},
+    { "QXmlStreamReader", "QtCore/qxmlstream.h"},
+    { "QXmlStreamWriter", "QtCore/qxmlstream.h"},
+    { "QFutureInterfaceBase", "QtCore/qfutureinterface.h"},
+    { "QFutureWatcherBase", "QtCore/qfuturewatcher.h"},
+    { "Exception", "QtCore/qtconcurrentexception.h"},
+    { "UnhandledException", "QtCore/qtconcurrentexception.h"},
+    { "ExceptionStore", "QtCore/qtconcurrentexception.h"},
+    { "BlockSizeManager", "QtCore/qtconcurrentiteratekernel.h"},
+    { "ResultIteratorBase", "QtCore/qtconcurrentresultstore.h"},
+    { "ResultStoreBase", "QtCore/qtconcurrentresultstore.h"},
+    { "ThreadEngineBase", "QtCore/qtconcurrentthreadengine.h"},
+    { "QThreadPool", "QtCore/qthreadpool.h"},
+    { "QBitArray", "QtCore/qbitarray.h"},
+    { "QBitRef", "QtCore/qbitarray.h"},
+    { "QByteArray", "QtCore/qbytearray.h"},
+    { "QByteRef", "QtCore/qbytearray.h"},
+    { "QByteArrayMatcher", "QtCore/qbytearraymatcher.h"},
+    { "QChar", "QtCore/qchar.h"},
+    { "QCommandLineOption", "QtCore/qcommandlineoption.h"},
+    { "QCommandLineParser", "QtCore/qcommandlineparser.h"},
+    { "QContiguousCacheData", "QtCore/qcontiguouscache.h"},
+    { "QCryptographicHash", "QtCore/qcryptographichash.h"},
+    { "QDate", "QtCore/qdatetime.h"},
+    { "QTime", "QtCore/qdatetime.h"},
+    { "QDateTime", "QtCore/qdatetime.h"},
+    { "QEasingCurve", "QtCore/qeasingcurve.h"},
+    { "QElapsedTimer", "QtCore/qelapsedtimer.h"},
+    { "QHashData", "QtCore/qhash.h"},
+    { "QLine", "QtCore/qline.h"},
+    { "QLineF", "QtCore/qline.h"},
+    { "QLinkedListData", "QtCore/qlinkedlist.h"},
+    { "QListData", "QtCore/qlist.h"},
+    { "QSystemLocale", "QtCore/qlocale.h"},
+    { "QLocale", "QtCore/qlocale.h"},
+    { "QMapData", "QtCore/qmap.h"},
+    { "QPoint", "QtCore/qpoint.h"},
+    { "QPointF", "QtCore/qpoint.h"},
+    { "QRect", "QtCore/qrect.h"},
+    { "QRectF", "QtCore/qrect.h"},
+    { "QRegExp", "QtCore/qregexp.h"},
+    { "QSharedData", "QtCore/qshareddata.h"},
+    { "QSize", "QtCore/qsize.h"},
+    { "QSizeF", "QtCore/qsize.h"},
+    { "QString", "QtCore/qstring.h"},
+    { "QLatin1String", "QtCore/qstring.h"},
+    { "QCharRef", "QtCore/qstring.h"},
+    { "QStringRef", "QtCore/qstring.h"},
+    { "QAbstractConcatenable", "QtCore/qstringbuilder.h"},
+    { "QStringList", "QtCore/qstringlist.h"},
+    { "QStringMatcher", "QtCore/qstringmatcher.h"},
+    { "QTextBoundaryFinder", "QtCore/qtextboundaryfinder.h"},
+    { "QTimeLine", "QtCore/qtimeline.h"},
+    { "QVectorData", "QtCore/qvector.h"},
+    { "QAtomicInt", "QtCore/qatomic.h"},
+    { "QAtomicPointer", "QtCore/qatomic.h"},
+    { "QMutex", "QtCore/qmutex.h"},
+    { "QMutexLocker", "QtCore/qmutex.h"},
+    { "QReadWriteLock", "QtCore/qreadwritelock.h"},
+    { "QReadLocker", "QtCore/qreadwritelock.h"},
+    { "QWriteLocker", "QtCore/qreadwritelock.h"},
+    { "QSemaphore", "QtCore/qsemaphore.h"},
+    { "QThread", "QtCore/qthread.h"},
+    { "QThreadStorageData", "QtCore/qthreadstorage.h"},
+    { "QWaitCondition", "QtCore/qwaitcondition.h"},
+    { "QFactoryInterface", "QtCore/qfactoryinterface.h"},
+    { "QLibrary", "QtCore/qlibrary.h"},
+    { "QPluginLoader", "QtCore/qpluginloader.h"},
+    { "QUuid", "QtCore/quuid.h"},
+    { "QAbstractAnimation", "QtCore/qabstractanimation.h"},
+    { "QAnimationDriver", "QtCore/qabstractanimation.h"},
+    { "QAnimationGroup", "QtCore/qanimationgroup.h"},
+    { "QParallelAnimationGroup", "QtCore/qparallelanimationgroup.h"},
+    { "QPauseAnimation", "QtCore/qpauseanimation.h"},
+    { "QPropertyAnimation", "QtCore/qpropertyanimation.h"},
+    { "QSequentialAnimationGroup", "QtCore/qsequentialanimationgroup.h"},
+    { "QVariantAnimation", "QtCore/qvariantanimation.h"},
+    { "QLibraryInfo", "QtCore/qlibraryinfo.h"},
+    { "QInternal", "QtCore/qnamespace.h"},
+    { "QJsonArray", "QtCore/qjsonarray.h"},
+    { "QJsonParseError", "QtCore/qjsondocument.h"},
+    { "QJsonDocument", "QtCore/qjsondocument.h"},
+    { "QJsonObject", "QtCore/qjsonobject.h"},
+    { "QJsonValue", "QtCore/qjsonvalue.h"},
+    { "QJsonValueRef", "QtCore/qjsonvalue.h"},
+    { "QJsonValueRefPtr", "QtCore/qjsonvalue.h"},
+    { "QJsonValuePtr", "QtCore/qjsonvalue.h"},
+    { "QAbstractFileEngine", "QtCore/qabstractfileengine.h"},
+    { "QAbstractFileEngineHandler", "QtCore/qabstractfileengine.h"},
+    { "QAbstractFileEngineIterator", "QtCore/qabstractfileengine.h"},
+    { "QBuffer", "QtCore/qbuffer.h"},
+    { "QDataStream", "QtCore/qdatastream.h"},
+    { "QDebug", "QtCore/qdebug.h"},
+    { "QDir", "QtCore/qdir.h"},
+    { "QDirIterator", "QtCore/qdiriterator.h"},
+    { "QFile", "QtCore/qfile.h"},
+    { "QFileInfo", "QtCore/qfileinfo.h"},
+    { "QFileSystemWatcher", "QtCore/qfilesystemwatcher.h"},
+    { "QFSFileEngine", "QtCore/qfsfileengine.h"},
+    { "QIODevice", "QtCore/qiodevice.h"},
+    { "QProcessEnvironment", "QtCore/qprocess.h"},
+    { "QProcess", "QtCore/qprocess.h"},
+    { "QResource", "QtCore/qresource.h"},
+    { "QSettings", "QtCore/qsettings.h"},
+    { "QStandardPaths", "QtCore/qstandardpaths.h"},
+    { "QTemporaryFile", "QtCore/qtemporaryfile.h"},
+    { "QTextStream", "QtCore/qtextstream.h"},
+    { "QTextStreamManipulator", "QtCore/qtextstream.h"},
+    { "QUrl", "QtCore/qurl.h"},
+    { "QAbstractEventDispatcher", "QtCore/qabstracteventdispatcher.h"},
+    { "QModelIndex", "QtCore/qabstractitemmodel.h"},
+    { "QPersistentModelIndex", "QtCore/qabstractitemmodel.h"},
+    { "QAbstractItemModel", "QtCore/qabstractitemmodel.h"},
+    { "QAbstractTableModel", "QtCore/qabstractitemmodel.h"},
+    { "QAbstractListModel", "QtCore/qabstractitemmodel.h"},
+    { "QBasicTimer", "QtCore/qbasictimer.h"},
+    { "QCoreApplication", "QtCore/qcoreapplication.h"},
+    { "QEvent", "QtCore/qcoreevent.h"},
+    { "QTimerEvent", "QtCore/qcoreevent.h"},
+    { "QChildEvent", "QtCore/qcoreevent.h"},
+    { "QDynamicPropertyChangeEvent", "QtCore/qcoreevent.h"},
+    { "QEventLoop", "QtCore/qeventloop.h"},
+    { "QMetaMethod", "QtCore/qmetaobject.h"},
+    { "QMetaEnum", "QtCore/qmetaobject.h"},
+    { "QMetaProperty", "QtCore/qmetaobject.h"},
+    { "QMetaClassInfo", "QtCore/qmetaobject.h"},
+    { "QMetaType", "QtCore/qmetatype.h"},
+    { "QMimeData", "QtCore/qmimedata.h"},
+    { "QObject", "QtCore/qobject.h"},
+    { "QObjectUserData", "QtCore/qobject.h"},
+    { "QObjectCleanupHandler", "QtCore/qobjectcleanuphandler.h"},
+    { "QGenericArgument", "QtCore/qobjectdefs.h"},
+    { "QGenericReturnArgument", "QtCore/qobjectdefs.h"},
+    { "QMetaObject", "QtCore/qobjectdefs.h"},
+    { "QSharedMemory", "QtCore/qsharedmemory.h"},
+    { "QSignalMapper", "QtCore/qsignalmapper.h"},
+    { "QSocketNotifier", "QtCore/qsocketnotifier.h"},
+    { "QSystemSemaphore", "QtCore/qsystemsemaphore.h"},
+    { "QTimer", "QtCore/qtimer.h"},
+    { "QTranslator", "QtCore/qtranslator.h"},
+    { "QVariant", "QtCore/qvariant.h"},
+    { "QDesignerComponents", "QtDesigner/qdesigner_components.h"},
+    { "ActionProviderBase", "QtDesigner/default_actionprovider.h"},
+    { "QToolBarActionProvider", "QtDesigner/default_actionprovider.h"},
+    { "QMenuBarActionProvider", "QtDesigner/default_actionprovider.h"},
+    { "QMenuActionProvider", "QtDesigner/default_actionprovider.h"},
+    { "FormEditor", "QtDesigner/formeditor.h"},
+    { "FormWindow", "QtDesigner/formwindow.h"},
+    { "FormWindowWidgetStack", "QtDesigner/formwindow_widgetstack.h"},
+    { "FormWindowCursor", "QtDesigner/formwindowcursor.h"},
+    { "FormWindowManager", "QtDesigner/formwindowmanager.h"},
+    { "IconCache", "QtDesigner/iconcache.h"},
+    { "QDesignerResource", "QtDesigner/qdesigner_resource.h"},
+    { "QtBrushManager", "QtDesigner/qtbrushmanager.h"},
+    { "WidgetHandle", "QtDesigner/widgetselection.h"},
+    { "WidgetSelection", "QtDesigner/widgetselection.h"},
+    { "NewDynamicPropertyDialog", "QtDesigner/newdynamicpropertydialog.h"},
+    { "PaletteEditorButton", "QtDesigner/paletteeditorbutton.h"},
+    { "PropertyEditor", "QtDesigner/propertyeditor.h"},
+    { "StringListEditorButton", "QtDesigner/stringlisteditorbutton.h"},
+    { "SignalSlotEditor", "QtDesigner/signalsloteditor.h"},
+    { "SignalSlotEditorPlugin", "QtDesigner/signalsloteditor_plugin.h"},
+    { "SignalSlotEditorTool", "QtDesigner/signalsloteditor_tool.h"},
+    { "ObjectInspector", "QtDesigner/objectinspector.h"},
+    { "WidgetBox", "QtDesigner/widgetbox.h"},
+    { "WidgetBoxDnDItem", "QtDesigner/widgetbox_dnditem.h"},
+    { "BuddyEditor", "QtDesigner/buddyeditor.h"},
+    { "BuddyEditorPlugin", "QtDesigner/buddyeditor_plugin.h"},
+    { "BuddyEditorTool", "QtDesigner/buddyeditor_tool.h"},
+    { "TabOrderEditor", "QtDesigner/tabordereditor.h"},
+    { "TabOrderEditorPlugin", "QtDesigner/tabordereditor_plugin.h"},
+    { "TabOrderEditorTool", "QtDesigner/tabordereditor_tool.h"},
+    { "TaskMenuComponent", "QtDesigner/taskmenu_component.h"},
+    { "QExtensionFactory", "QtDesigner/default_extensionfactory.h"},
+    { "QExtensionManager", "QtDesigner/qextensionmanager.h"},
+    { "QScriptEngineDebugger", "QtScriptTools/qscriptenginedebugger.h"},
     { "QDBusAbstractAdaptor", "QtDBus/qdbusabstractadaptor.h"},
     { "QDBusAbstractInterfaceBase", "QtDBus/qdbusabstractinterface.h"},
     { "QDBusAbstractInterface", "QtDBus/qdbusabstractinterface.h"},
@@ -683,46 +678,51 @@ static const ClassInfoEntry qclass_lib_map[] = {
     { "QDBusServiceWatcher", "QtDBus/qdbusservicewatcher.h"},
     { "QDBusUnixFileDescriptor", "QtDBus/qdbusunixfiledescriptor.h"},
     { "QDBusVirtualObject", "QtDBus/qdbusvirtualobject.h"},
-    { "QAbstractSocket", "QtNetwork/qabstractsocket.h"},
-    { "QLocalServer", "QtNetwork/qlocalserver.h"},
-    { "QLocalSocket", "QtNetwork/qlocalsocket.h"},
-    { "QTcpServer", "QtNetwork/qtcpserver.h"},
-    { "QTcpSocket", "QtNetwork/qtcpsocket.h"},
-    { "QUdpSocket", "QtNetwork/qudpsocket.h"},
-    { "QNetworkConfigurationManager", "QtNetwork/qnetworkconfigmanager.h"},
-    { "QNetworkConfiguration", "QtNetwork/qnetworkconfiguration.h"},
-    { "QNetworkSession", "QtNetwork/qnetworksession.h"},
-    { "QAuthenticator", "QtNetwork/qauthenticator.h"},
-    { "QIPv6Address", "QtNetwork/qhostaddress.h"},
-    { "QHostAddress", "QtNetwork/qhostaddress.h"},
-    { "QHostInfo", "QtNetwork/qhostinfo.h"},
-    { "QNetworkAddressEntry", "QtNetwork/qnetworkinterface.h"},
-    { "QNetworkInterface", "QtNetwork/qnetworkinterface.h"},
-    { "QNetworkProxyQuery", "QtNetwork/qnetworkproxy.h"},
-    { "QNetworkProxy", "QtNetwork/qnetworkproxy.h"},
-    { "QNetworkProxyFactory", "QtNetwork/qnetworkproxy.h"},
-    { "QUrlInfo", "QtNetwork/qurlinfo.h"},
-    { "QNetworkCacheMetaData", "QtNetwork/qabstractnetworkcache.h"},
-    { "QAbstractNetworkCache", "QtNetwork/qabstractnetworkcache.h"},
-    { "QFtp", "QtNetwork/qftp.h"},
-    { "QHttpHeader", "QtNetwork/qhttp.h"},
-    { "QHttpResponseHeader", "QtNetwork/qhttp.h"},
-    { "QHttpRequestHeader", "QtNetwork/qhttp.h"},
-    { "QHttp", "QtNetwork/qhttp.h"},
-    { "QHttpPart", "QtNetwork/qhttpmultipart.h"},
-    { "QHttpMultiPart", "QtNetwork/qhttpmultipart.h"},
-    { "QNetworkAccessManager", "QtNetwork/qnetworkaccessmanager.h"},
-    { "QNetworkCookie", "QtNetwork/qnetworkcookie.h"},
-    { "QNetworkCookieJar", "QtNetwork/qnetworkcookiejar.h"},
-    { "QNetworkDiskCache", "QtNetwork/qnetworkdiskcache.h"},
-    { "QNetworkReply", "QtNetwork/qnetworkreply.h"},
-    { "QNetworkRequest", "QtNetwork/qnetworkrequest.h"},
-    { "QSslCertificate", "QtNetwork/qsslcertificate.h"},
-    { "QSslCipher", "QtNetwork/qsslcipher.h"},
-    { "QSslConfiguration", "QtNetwork/qsslconfiguration.h"},
-    { "QSslError", "QtNetwork/qsslerror.h"},
-    { "QSslKey", "QtNetwork/qsslkey.h"},
-    { "QSslSocket", "QtNetwork/qsslsocket.h"},
+    { "QGLFormat", "QtOpenGL/qgl.h"},
+    { "QGLContext", "QtOpenGL/qgl.h"},
+    { "QGLWidget", "QtOpenGL/qgl.h"},
+    { "QGLBuffer", "QtOpenGL/qglbuffer.h"},
+    { "QGLColormap", "QtOpenGL/qglcolormap.h"},
+    { "QGLFramebufferObject", "QtOpenGL/qglframebufferobject.h"},
+    { "QGLFramebufferObjectFormat", "QtOpenGL/qglframebufferobject.h"},
+    { "QGLFunctions", "QtOpenGL/qglfunctions.h"},
+    { "QGLPixelBuffer", "QtOpenGL/qglpixelbuffer.h"},
+    { "QGLShader", "QtOpenGL/qglshaderprogram.h"},
+    { "QGLShaderProgram", "QtOpenGL/qglshaderprogram.h"},
+    { "QDeclarativeComponent", "QtDeclarative/qdeclarativecomponent.h"},
+    { "QDeclarativeContext", "QtDeclarative/qdeclarativecontext.h"},
+    { "QDeclarativeEngine", "QtDeclarative/qdeclarativeengine.h"},
+    { "QDeclarativeError", "QtDeclarative/qdeclarativeerror.h"},
+    { "QDeclarativeExpression", "QtDeclarative/qdeclarativeexpression.h"},
+    { "QDeclarativeExtensionInterface", "QtDeclarative/qdeclarativeextensioninterface.h"},
+    { "QDeclarativeExtensionPlugin", "QtDeclarative/qdeclarativeextensionplugin.h"},
+    { "QDeclarativeImageProvider", "QtDeclarative/qdeclarativeimageprovider.h"},
+    { "QDeclarativeInfo", "QtDeclarative/qdeclarativeinfo.h"},
+    { "QDeclarativeListReference", "QtDeclarative/qdeclarativelist.h"},
+    { "QDeclarativeNetworkAccessManagerFactory", "QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h"},
+    { "QDeclarativeParserStatus", "QtDeclarative/qdeclarativeparserstatus.h"},
+    { "QDeclarativeProperty", "QtDeclarative/qdeclarativeproperty.h"},
+    { "QDeclarativePropertyValueInterceptor", "QtDeclarative/qdeclarativepropertyvalueinterceptor.h"},
+    { "QDeclarativePropertyValueSource", "QtDeclarative/qdeclarativepropertyvaluesource.h"},
+    { "QDeclarativeScriptString", "QtDeclarative/qdeclarativescriptstring.h"},
+    { "QDeclarativeItem", "QtDeclarative/qdeclarativeitem.h"},
+    { "QDeclarativePropertyMap", "QtDeclarative/qdeclarativepropertymap.h"},
+    { "QDeclarativeView", "QtDeclarative/qdeclarativeview.h"},
+    { "QSqlQueryModel", "QtSql/qsqlquerymodel.h"},
+    { "QSqlRelation", "QtSql/qsqlrelationaltablemodel.h"},
+    { "QSqlRelationalTableModel", "QtSql/qsqlrelationaltablemodel.h"},
+    { "QSqlTableModel", "QtSql/qsqltablemodel.h"},
+    { "QSqlDriverCreatorBase", "QtSql/qsqldatabase.h"},
+    { "QSqlDatabase", "QtSql/qsqldatabase.h"},
+    { "QSqlDriver", "QtSql/qsqldriver.h"},
+    { "QSqlDriverFactoryInterface", "QtSql/qsqldriverplugin.h"},
+    { "QSqlDriverPlugin", "QtSql/qsqldriverplugin.h"},
+    { "QSqlError", "QtSql/qsqlerror.h"},
+    { "QSqlField", "QtSql/qsqlfield.h"},
+    { "QSqlIndex", "QtSql/qsqlindex.h"},
+    { "QSqlQuery", "QtSql/qsqlquery.h"},
+    { "QSqlRecord", "QtSql/qsqlrecord.h"},
+    { "QSqlResult", "QtSql/qsqlresult.h"},
 };
 static const int qclass_lib_count = 718;