re-enable QT_NO_LIBRARY support on Windows

the exclusion came in with the original winCE port. the reason for this
is not clear.

Change-Id: I8cd59d27fcc292186e5eef3238f56bad2cf320c1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
bb10
Oswald Buddenhagen 2013-03-11 20:29:27 +01:00 committed by The Qt Project
parent 096e32d814
commit e6aba2f7cd
4 changed files with 5 additions and 15 deletions

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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