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>
This commit is contained in:
parent
6b98bf6a14
commit
2929b920af
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user