diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2011-11-15 11:23:33 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-16 11:56:48 +0100 |
| commit | 91af3336344548d7540a3e6296879d7132eb0c55 (patch) | |
| tree | 67b28fa799064bca8fa726144335c9173f66335c | |
| parent | 4dc390e66fefc850cf84292549285a359e2ad8e6 (diff) | |
Fix Qt namespace compilation.
Change-Id: I259b5fde8e4d75d28def8650c4c9208accdf0bbe
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | src/corelib/kernel/qmetatypeswitcher_p.h | 4 | ||||
| -rw-r--r-- | src/gui/accessible/qplatformaccessibility_qpa.cpp | 4 | ||||
| -rw-r--r-- | src/network/ssl/qsslcertificateextension.cpp | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatypeswitcher_p.h b/src/corelib/kernel/qmetatypeswitcher_p.h index 2a443aa60e..cba6504956 100644 --- a/src/corelib/kernel/qmetatypeswitcher_p.h +++ b/src/corelib/kernel/qmetatypeswitcher_p.h @@ -55,6 +55,8 @@ // We mean it. // +QT_BEGIN_NAMESPACE + class QMetaTypeSwitcher { public: @@ -98,4 +100,6 @@ ReturnType QMetaTypeSwitcher::switcher(DelegateObject &logic, int type, const vo #undef QT_METATYPE_SWICHER_CASE_QCLASS #undef QT_METATYPE_SWICHER_CASE_POINTER +QT_END_NAMESPACE + #endif // QMETATYPESWITCHER_P_H diff --git a/src/gui/accessible/qplatformaccessibility_qpa.cpp b/src/gui/accessible/qplatformaccessibility_qpa.cpp index f912907db3..fa8da1f78c 100644 --- a/src/gui/accessible/qplatformaccessibility_qpa.cpp +++ b/src/gui/accessible/qplatformaccessibility_qpa.cpp @@ -45,6 +45,8 @@ #include "qaccessiblebridge.h" #include <QtGui/QGuiApplication> +QT_BEGIN_NAMESPACE + /* accessiblebridge plugin discovery stuff */ #ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, bridgeloader, @@ -134,7 +136,6 @@ void QPlatformAccessibility::initialize() QAccessibleBridge * bridge = factory->create(l.at(i)); if (bridge) { bridges()->append(bridge); -# } } } @@ -146,3 +147,4 @@ void QPlatformAccessibility::cleanup() qDeleteAll(*bridges()); } +QT_END_NAMESPACE diff --git a/src/network/ssl/qsslcertificateextension.cpp b/src/network/ssl/qsslcertificateextension.cpp index b154ce70a5..b4d002ead1 100644 --- a/src/network/ssl/qsslcertificateextension.cpp +++ b/src/network/ssl/qsslcertificateextension.cpp @@ -198,3 +198,5 @@ bool QSslCertificateExtension::isSupported() const { return d->supported; } + +QT_END_NAMESPACE |