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/qpluginloader.cpp | |
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/qpluginloader.cpp')
-rw-r--r-- | src/corelib/plugin/qpluginloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp index 4ec4e43952..6723877ad5 100644 --- a/src/corelib/plugin/qpluginloader.cpp +++ b/src/corelib/plugin/qpluginloader.cpp @@ -43,7 +43,7 @@ #include "qcoreapplication.h" #include "qpluginloader.h" #include <qfileinfo.h> -#include "qlibrary_p.h" +#include "qfactoryloader_p.h" #include "qdebug.h" #include "qdir.h" |