diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 09:11:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 09:11:35 (GMT) |
| commit | bea0a4195bcd641a05ae7195cf319590a254b876 (patch) | |
| tree | a916b62d4a069c457648c6ed134a8e49e8d59786 /src/script/bridge/qscriptvariant_p.h | |
| parent | 576cb12c36f24917d674f4c0bf240441b4ac9b43 (diff) | |
| parent | a30b5ebbbcc4af0b82894edf4e026d4aea25bd95 (diff) | |
| download | Qt-bea0a4195bcd641a05ae7195cf319590a254b876.zip Qt-bea0a4195bcd641a05ae7195cf319590a254b876.tar.gz Qt-bea0a4195bcd641a05ae7195cf319590a254b876.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (22 commits)
Restore file deleted during merge conflict resolution
added closing parenthesis in helpviewer_qtb.cpp
Bug fix: Allow $QTDIR to contain regex metacharacters
Fix to allow upper- and lowercase .dll suffix on windows
avoid infinite recursion in canonicalized() if cwd is a symlink
Fix conversion between QVariant and QScriptValue.
Temporarily disable tests that use createNtfsJunction()
Fix a small typo in setColor description (brush -> color)
Unable to load plugin DLLs compiled with the '/clr' option
Remove legacy macros.
Repositioned _WIN32_WINNT define in tst_qfileinfo and tst_qdir
tst_networkselftest: fix building on Windows
Assistant: Fix line endings.
Assistant: Fix license headers.
Fix for missing wchar_t pointer casts in filesystem.h
Assistant: Don't display close button when it's not functional.
Assistant: Fix some merge artifacts.
Use GetProcAddress for GetVolumePathNamesForVolumeNameW
Fix for missing wchar_t pointer cast in qfsfileengine_win.cpp
Added support for symlinks and junction points on Windows
...
Diffstat (limited to 'src/script/bridge/qscriptvariant_p.h')
0 files changed, 0 insertions, 0 deletions