diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:28 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 14:31:28 +0100 |
| commit | 425b38ef95f6f4478ffbd4ada0d3046fae2c95e7 (patch) | |
| tree | 0347dd701ace8ab022cf6c86edbb61be9795a668 /src/network/ssl/qsslkey.cpp | |
| parent | 2f2b78321427daa8c7f0702140c297d22b0bf3c8 (diff) | |
| parent | 3b512ae142017f105f297467f74dc28d3cb9030a (diff) | |
Merge "Merge master into api_changes" into refs/staging/api_changes
Diffstat (limited to 'src/network/ssl/qsslkey.cpp')
| -rw-r--r-- | src/network/ssl/qsslkey.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/network/ssl/qsslkey.cpp b/src/network/ssl/qsslkey.cpp index f422952870..c1dcf7d223 100644 --- a/src/network/ssl/qsslkey.cpp +++ b/src/network/ssl/qsslkey.cpp @@ -66,10 +66,9 @@ #include <QtCore/qiodevice.h> #ifndef QT_NO_DEBUG_STREAM #include <QtCore/qdebug.h> - -QT_BEGIN_NAMESPACE #endif +QT_BEGIN_NAMESPACE /*! \internal |