From 2929b920afb691dd8d9e6fbd9641f3278685669e Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 2 May 2012 10:34:43 +1000 Subject: Fixed windows platform plugin with -qtnamespace. Added missing QT_BEGIN_NAMESPACE/QT_END_NAMESPACE Change-Id: I2ffc5ec18d19027c01c81ba9c29f6d7cac5e9619 Reviewed-by: Toby Tomkins --- src/plugins/platforms/windows/accessible/comutils.cpp | 4 ++++ src/plugins/platforms/windows/accessible/comutils.h | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'src/plugins/platforms/windows') diff --git a/src/plugins/platforms/windows/accessible/comutils.cpp b/src/plugins/platforms/windows/accessible/comutils.cpp index 9a0fce20b8..2823306609 100644 --- a/src/plugins/platforms/windows/accessible/comutils.cpp +++ b/src/plugins/platforms/windows/accessible/comutils.cpp @@ -51,6 +51,8 @@ #include #include +QT_BEGIN_NAMESPACE + static DATE QDateTimeToDATE(const QDateTime &dt) { if (!dt.isValid() || dt.isNull()) @@ -639,3 +641,5 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type return true; } +QT_END_NAMESPACE + diff --git a/src/plugins/platforms/windows/accessible/comutils.h b/src/plugins/platforms/windows/accessible/comutils.h index 08420cc46c..4d8e603899 100644 --- a/src/plugins/platforms/windows/accessible/comutils.h +++ b/src/plugins/platforms/windows/accessible/comutils.h @@ -48,6 +48,8 @@ #include #include +QT_BEGIN_NAMESPACE + class QVariant; bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &typeName, bool out); @@ -57,5 +59,7 @@ inline BSTR QStringToBSTR(const QString &str) return SysAllocStringLen((OLECHAR*)str.unicode(), str.length()); } +QT_END_NAMESPACE + #endif // COMUTILS_H -- cgit v1.2.3