diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 12:32:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 12:32:07 (GMT) |
| commit | bb3c309cf99e043b4de43feaa8c2a801f7853d22 (patch) | |
| tree | 609163646671a793c2f422501f70d9805dab27df /src/testlib/qtestxmlstreamer.h | |
| parent | ef5eabdd58a9f584cff8b4e70b7eea583957114c (diff) | |
| parent | 7d857bee73c9e81da203543a132b5b836853b797 (diff) | |
| download | Qt-bb3c309cf99e043b4de43feaa8c2a801f7853d22.zip Qt-bb3c309cf99e043b4de43feaa8c2a801f7853d22.tar.gz Qt-bb3c309cf99e043b4de43feaa8c2a801f7853d22.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslCertificate: block all DigiNotar (intermediate and root) certs
QSslCertificate: also check common name for blacklisted certificates
Fix typo in header guard.
fix doc typo
Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk
remove obsolete define
Diffstat (limited to 'src/testlib/qtestxmlstreamer.h')
| -rw-r--r-- | src/testlib/qtestxmlstreamer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qtestxmlstreamer.h b/src/testlib/qtestxmlstreamer.h index 46318a9..d4a9079 100644 --- a/src/testlib/qtestxmlstreamer.h +++ b/src/testlib/qtestxmlstreamer.h @@ -40,7 +40,7 @@ ****************************************************************************/ #ifndef QTESTXMLSTREAMER_H -#define QTESXMLSTREAMER_H +#define QTESTXMLSTREAMER_H #include <QtTest/qtestbasicstreamer.h> |