diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-02-15 11:23:24 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-02-22 17:36:32 +0000 |
| commit | 4e9f7807fbca948f355fa6aa17e0bbeb86d065a3 (patch) | |
| tree | 95cb5d32db463238b90666103e924bdf09b2c145 /src/corelib/plugin/qlibrary_p.h | |
| parent | 4c367833b4c1776f01eff3d51472a9889c85e1c5 (diff) | |
Move qJsonFromRawLibraryMetaData into qfactoryloader_p.h
This is still not a great place for it, but this way we can
Q_REQUIRE_CONFIG(library) in qlibrary_p.h and qfactoryloader_p.h is the
only private header that doesn't require library support in plugin.pri.
Change-Id: Ia6c1ac8799822eca1e0cbeca98d1c1b8de74beae
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/plugin/qlibrary_p.h')
| -rw-r--r-- | src/corelib/plugin/qlibrary_p.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/corelib/plugin/qlibrary_p.h b/src/corelib/plugin/qlibrary_p.h index f883e74843..7147ff6ca2 100644 --- a/src/corelib/plugin/qlibrary_p.h +++ b/src/corelib/plugin/qlibrary_p.h @@ -58,25 +58,12 @@ #include "QtCore/qstringlist.h" #include "QtCore/qplugin.h" #include "QtCore/qsharedpointer.h" -#include "QtCore/qjsonobject.h" -#include "QtCore/qjsondocument.h" -#include "QtCore/qendian.h" #ifdef Q_OS_WIN # include "QtCore/qt_windows.h" #endif QT_BEGIN_NAMESPACE -// Needed also in case of QT_NO_LIBRARY, for static plugin loading. -inline QJsonDocument qJsonFromRawLibraryMetaData(const char *raw) -{ - raw += strlen("QTMETADATA "); - // the size of the embedded JSON object can be found 8 bytes into the data (see qjson_p.h), - // but doesn't include the size of the header (8 bytes) - QByteArray json(raw, qFromLittleEndian<uint>(*(const uint *)(raw + 8)) + 8); - return QJsonDocument::fromBinaryData(json); -} - #ifndef QT_NO_LIBRARY |