diff options
| -rw-r--r-- | src/corelib/io/qfilesystemengine_win.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/plugin/qlibrary.h | 6 | ||||
| -rw-r--r-- | src/corelib/plugin/qlibrary_win.cpp | 7 | ||||
| -rw-r--r-- | src/corelib/plugin/qpluginloader.h | 5 |
4 files changed, 5 insertions, 15 deletions
diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index 5bd9903da1..bee7689535 100644 --- a/src/corelib/io/qfilesystemengine_win.cpp +++ b/src/corelib/io/qfilesystemengine_win.cpp @@ -145,8 +145,10 @@ Q_CORE_EXPORT int qt_ntfs_permission_lookup = 0; static QString qfsPrivateCurrentDir = QLatin1String(""); // As none of the functions we try to resolve do exist on Windows CE // we use QT_NO_LIBRARY to shorten everything up a little bit. +#ifndef QT_NO_LIBRARY #define QT_NO_LIBRARY 1 #endif +#endif #if !defined(QT_NO_LIBRARY) QT_BEGIN_INCLUDE_NAMESPACE diff --git a/src/corelib/plugin/qlibrary.h b/src/corelib/plugin/qlibrary.h index 5c81e6af1a..865bb8c3e3 100644 --- a/src/corelib/plugin/qlibrary.h +++ b/src/corelib/plugin/qlibrary.h @@ -46,12 +46,6 @@ 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; diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp index f066ff2df4..16445f1163 100644 --- a/src/corelib/plugin/qlibrary_win.cpp +++ b/src/corelib/plugin/qlibrary_win.cpp @@ -46,10 +46,7 @@ #include "qfileinfo.h" #include <private/qfilesystementry_p.h> -#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 #include <qt_windows.h> @@ -166,3 +163,5 @@ QFunctionPointer QLibraryPrivate::resolve_sys(const char* symbol) return QFunctionPointer(address); } QT_END_NAMESPACE + +#endif // QT_NO_LIBRARY diff --git a/src/corelib/plugin/qpluginloader.h b/src/corelib/plugin/qpluginloader.h index 3d1d2dbe0b..8f8833e839 100644 --- a/src/corelib/plugin/qpluginloader.h +++ b/src/corelib/plugin/qpluginloader.h @@ -44,11 +44,6 @@ #include <QtCore/qlibrary.h> -#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 QT_BEGIN_NAMESPACE |