diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 13:36:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:10:58 +0100 |
| commit | 3b512ae142017f105f297467f74dc28d3cb9030a (patch) | |
| tree | 9e131e23c01537f051851a1da9576c1e1ddf5ba2 /src/network/ssl | |
| parent | e20c4730192f312881591fb50e571af0a88fe421 (diff) | |
| parent | f956f9a83603a3df5651e3238c24e8df37558d6e (diff) | |
Merge master into api_changes
Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1
Diffstat (limited to 'src/network/ssl')
| -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 |