diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-10 12:09:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-10 12:09:39 (GMT) |
| commit | e5c522d4358bd6c9776c84c7fcfffb120d76725e (patch) | |
| tree | e6bde8c1c0c571cda85f9902ffde89a66a7c0351 /doc/src/snippets/plaintextlayout/window.h | |
| parent | 2bddf15b87a9e27bfdcbc3aec5d79da49f070c15 (diff) | |
| parent | 13370ead4e9184fd82c08c060dbb1ea29a51cc7c (diff) | |
| download | Qt-e5c522d4358bd6c9776c84c7fcfffb120d76725e.zip Qt-e5c522d4358bd6c9776c84c7fcfffb120d76725e.tar.gz Qt-e5c522d4358bd6c9776c84c7fcfffb120d76725e.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 reversed condition introduced in 9a6cfc07e5
Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
Fix compilation error on Solaris
Check elapsed time only once
Diffstat (limited to 'doc/src/snippets/plaintextlayout/window.h')
0 files changed, 0 insertions, 0 deletions