diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-28 13:30:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-28 13:30:15 (GMT) |
| commit | 47f9469f825141a346592f14d5e7db12da7fa307 (patch) | |
| tree | 964999ef107617c81cae33746f3016dee45ec009 /src/script/api/qscriptengine.cpp | |
| parent | 06dfdf230dfcebbf955cdb6bd302fad88fe0398f (diff) | |
| parent | b23604fe002533e51ad1cdbb0bf16eec37ad3267 (diff) | |
| download | Qt-47f9469f825141a346592f14d5e7db12da7fa307.zip Qt-47f9469f825141a346592f14d5e7db12da7fa307.tar.gz Qt-47f9469f825141a346592f14d5e7db12da7fa307.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:
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
Assistant: Get rid of tabs.
Assistant: Move search widget into the dock area.
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
0 files changed, 0 insertions, 0 deletions