diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2016-12-19 10:34:32 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-06 11:27:20 +0000 |
commit | d6330a19b29ebff359a6746250c78437dbcaf77d (patch) | |
tree | 3ab0e390f0bfd30bb235ed5a0128bfd33e9cd4b7 /src/corelib/plugin/qpluginloader.h | |
parent | f31dbeb4c7cd0d7559a8d7f523a3feea7d376186 (diff) |
Use QT_CONFIG(library) instead of QT_NO_LIBRARY
For the windows file system engine, we add an extra macro to use
library loading if configured to do so, but avoid it on WinRT, as
none of the symbols would be found.
We also QT_REQUIRE_CONFIG(library) in the library headers and
exclude the sources from the build if library loading is disabled.
This, in turn, makes it necessary to clean up some header inclusions.
Change-Id: I2b152cb5b47a2658996b6f4702b038536a5704ec
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/plugin/qpluginloader.h')
-rw-r--r-- | src/corelib/plugin/qpluginloader.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/plugin/qpluginloader.h b/src/corelib/plugin/qpluginloader.h index 5dca59c271..80b10f76bf 100644 --- a/src/corelib/plugin/qpluginloader.h +++ b/src/corelib/plugin/qpluginloader.h @@ -40,12 +40,15 @@ #ifndef QPLUGINLOADER_H #define QPLUGINLOADER_H +#include <QtCore/qglobal.h> +#if QT_CONFIG(library) #include <QtCore/qlibrary.h> +#endif #include <QtCore/qplugin.h> QT_BEGIN_NAMESPACE -#ifndef QT_NO_LIBRARY +#if QT_CONFIG(library) class QLibraryPrivate; class QJsonObject; @@ -93,7 +96,7 @@ public: static QVector<QStaticPlugin> staticPlugins(); }; -#endif // QT_NO_LIBRARY +#endif // QT_CONFIG(library) QT_END_NAMESPACE |