diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-26 14:19:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-26 14:19:00 (GMT) |
| commit | cdd272e525c2e57f5834855305f63f6aee1301ef (patch) | |
| tree | 55279a5dd5d1ce41fd684a0d391ed0d09f1022f0 /doc/src/snippets/code/src_script_qscriptclass.cpp | |
| parent | f6f9777408691a945c49ef8ec5037d8401c747eb (diff) | |
| parent | 2c99794e486234580fc0e149c1f176edb57d6565 (diff) | |
| download | Qt-cdd272e525c2e57f5834855305f63f6aee1301ef.zip Qt-cdd272e525c2e57f5834855305f63f6aee1301ef.tar.gz Qt-cdd272e525c2e57f5834855305f63f6aee1301ef.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:
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 'doc/src/snippets/code/src_script_qscriptclass.cpp')
0 files changed, 0 insertions, 0 deletions