diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 23:30:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-20 23:30:31 +0100 |
| commit | e5a11fbb3251a98fafd6bebf0b6fc366acb19088 (patch) | |
| tree | 8e1bd6704205307e0a23484221ea1bb67a9f411e /src/corelib/plugin/qlibrary.h | |
| parent | 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff) | |
| parent | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (diff) | |
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to 'src/corelib/plugin/qlibrary.h')
| -rw-r--r-- | src/corelib/plugin/qlibrary.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/corelib/plugin/qlibrary.h b/src/corelib/plugin/qlibrary.h index f99c69c2d7..865bb8c3e3 100644 --- a/src/corelib/plugin/qlibrary.h +++ b/src/corelib/plugin/qlibrary.h @@ -44,16 +44,8 @@ #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE - -#if defined(QT_NO_LIBRARY) && defined(Q_OS_WIN) -#undef QT_NO_LIBRARY -#pragma message("QT_NO_LIBRARY is not supported on Windows") -#endif - #ifndef QT_NO_LIBRARY class QLibraryPrivate; @@ -111,6 +103,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QLibrary::LoadHints) QT_END_NAMESPACE -QT_END_HEADER - #endif //QLIBRARY_H |