diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-05-02 10:34:43 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 03:20:56 +0200 |
| commit | 2929b920afb691dd8d9e6fbd9641f3278685669e (patch) | |
| tree | e25be09a2b074fcfb60a2365e7dc6f64928f307b /src | |
| parent | 6b98bf6a142002f27469d94ef489c3e081936a76 (diff) | |
Fixed windows platform plugin with -qtnamespace.
Added missing QT_BEGIN_NAMESPACE/QT_END_NAMESPACE
Change-Id: I2ffc5ec18d19027c01c81ba9c29f6d7cac5e9619
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/windows/accessible/comutils.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/accessible/comutils.h | 4 |
2 files changed, 8 insertions, 0 deletions
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 <QtCore/qbytearray.h> #include <QtGui/qcolor.h> +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 <ocidl.h> #include <QtCore/qstring.h> +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 |