diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-02 04:47:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-02 04:47:27 (GMT) |
| commit | 57d33781bd8e02904a85de7fc54f8f4e8bd299e6 (patch) | |
| tree | 97d73379096470650a10e0bfb7ebcfe212cacd6b /.hgignore | |
| parent | 64ca7030df6189a0bc4df36473befd868c8d2ef6 (diff) | |
| parent | 669d23710f449617a327cf38b7d09867b28335ff (diff) | |
| download | Qt-57d33781bd8e02904a85de7fc54f8f4e8bd299e6.zip Qt-57d33781bd8e02904a85de7fc54f8f4e8bd299e6.tar.gz Qt-57d33781bd8e02904a85de7fc54f8f4e8bd299e6.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed maketestselftest failure with some MSVC versions.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( afc4c208fe296f5a1dd0e73f2bd1273bd22d9b24 )
Fix a problem with overlay icons in the fileiconprovider
Only set the _WIN32_WINNT define if it is not set or less than 0x0400
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions