diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-01 09:48:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-01 09:48:40 (GMT) |
| commit | 0f10e3603fc5f24ebd3773cb2976d0bb24fcbd17 (patch) | |
| tree | 4bfa9c57e62b023730ec5fc7dafbd45cfc33c086 /src/corelib | |
| parent | c9fb043d9fa38dd8eec6976e7a338dc89ddc5b0e (diff) | |
| parent | bf8f39329c05a92c3da2b73b4e555dc9980e6008 (diff) | |
| download | Qt-0f10e3603fc5f24ebd3773cb2976d0bb24fcbd17.zip Qt-0f10e3603fc5f24ebd3773cb2976d0bb24fcbd17.tar.gz Qt-0f10e3603fc5f24ebd3773cb2976d0bb24fcbd17.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Make macdeployqt more robust against usage of symbolic links.
Document support for Linguist on Mac.
Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle.
Guard macdeployqt against @rpath and @loader_path too.
Fix typo.
OpenVG cleanup.
Include trailing space width in RTL text line width
Fix the compilation error when QT_NO_PLUGIN_CHECK was set.
Fixed holes in border image drawing by introducing new API.
Properly resolve and use glMapBuffer / glUnmapBuffer on GLES2.
Revert "fix QFileInfo::isSymLink() for NTFS mount points"
Remove debug output.
Add some sound support to the uikit platform.
Add flickrdemo uikit example project.
Fix uikit simulator build.
Get subpixel antialiasing again w/combo of raster and affine transform
Add initial support for bitmap version 4/5 headers.
optimize QRawFont::supportsCharacter()
Switch to use floating point pixelSize in QRawFont completely
Add a way to check if we have a matching family in the database.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qfilesystemmetadata_p.h | 3 | ||||
| -rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/corelib/io/qfilesystemmetadata_p.h b/src/corelib/io/qfilesystemmetadata_p.h index de5b003..c961101 100644 --- a/src/corelib/io/qfilesystemmetadata_p.h +++ b/src/corelib/io/qfilesystemmetadata_p.h @@ -369,7 +369,8 @@ inline void QFileSystemMetaData::fillFromFindData(WIN32_FIND_DATA &findData, boo entryFlags &= ~LinkType; #if !defined(Q_OS_WINCE) if ((fileAttribute_ & FILE_ATTRIBUTE_REPARSE_POINT) - && (findData.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) { + && (findData.dwReserved0 == IO_REPARSE_TAG_SYMLINK + || findData.dwReserved0 == IO_REPARSE_TAG_MOUNT_POINT)) { entryFlags |= LinkType; } #endif diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index 314ccd7..f1ed8e4 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -649,7 +649,12 @@ bool qt_get_verificationdata(QtPluginQueryVerificationDataFunction pfn, uint *qt #else szData = pfn(); #endif - return qt_parse_pattern(szData, qt_version, debug, key); + +#ifdef QT_NO_PLUGIN_CHECK + return true; +#else + return qt_parse_pattern(szData, qt_version, debug, key); +#endif } bool QLibraryPrivate::isPlugin(QSettings *settings) |