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/qlibrary.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/qlibrary.h')
| -rw-r--r-- | src/corelib/plugin/qlibrary.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/plugin/qlibrary.h b/src/corelib/plugin/qlibrary.h index 2b91fa4007..89be52aac3 100644 --- a/src/corelib/plugin/qlibrary.h +++ b/src/corelib/plugin/qlibrary.h @@ -42,9 +42,9 @@ #include <QtCore/qobject.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(library); -#ifndef QT_NO_LIBRARY +QT_BEGIN_NAMESPACE class QLibraryPrivate; @@ -99,8 +99,6 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QLibrary::LoadHints) -#endif //QT_NO_LIBRARY - QT_END_NAMESPACE #endif //QLIBRARY_H |