AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed windows platform plugin with -qtnamespace.

Browse Source 
Added missing QT_BEGIN_NAMESPACE/QT_END_NAMESPACE

Change-Id: I2ffc5ec18d19027c01c81ba9c29f6d7cac5e9619
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
This commit is contained in:
Rohan McGovern 2012-05-02 10:34:43 +10:00 committed by Qt by Nokia
parent 6b98bf6a14
commit 2929b920af
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/windows/accessible/comutils.cpp
View File

@ -51,6 +51,8 @@
#include <QtCore/qbytearray.h> #include <QtCore/qbytearray.h>
#include <QtGui/qcolor.h> #include <QtGui/qcolor.h>
QT_BEGIN_NAMESPACE
static DATE QDateTimeToDATE(const QDateTime &dt) static DATE QDateTimeToDATE(const QDateTime &dt)
{ {
if (!dt.isValid() || dt.isNull()) if (!dt.isValid() || dt.isNull())
@ -639,3 +641,5 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type
return true; return true;
} }
QT_END_NAMESPACE

4
src/plugins/platforms/windows/accessible/comutils.h
View File

@ -48,6 +48,8 @@
#include <ocidl.h> #include <ocidl.h>
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
QT_BEGIN_NAMESPACE
class QVariant; class QVariant;
bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &typeName, bool out); 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()); return SysAllocStringLen((OLECHAR*)str.unicode(), str.length());
} }
QT_END_NAMESPACE
#endif // COMUTILS_H #endif // COMUTILS_H