summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-07 06:11:44 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-07 06:11:44 (GMT)
commit7f1eac149d76f33770f54b20fe7cd27a4e4b09d4 (patch)
tree51e762010cb7b7fa8450e49991e9a6f22f445f90 /src/declarative/qml
parentfa730e0d0ba38ca7db09b6eb95bb656bdc67a8b0 (diff)
downloadQt-7f1eac149d76f33770f54b20fe7cd27a4e4b09d4.zip
Qt-7f1eac149d76f33770f54b20fe7cd27a4e4b09d4.tar.gz
Qt-7f1eac149d76f33770f54b20fe7cd27a4e4b09d4.tar.bz2
Build on Windows.
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qdeclarativevme.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index 0117880..2d1a549 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -246,7 +246,12 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
{
QObject *o = (QObject *)operator new(instr.createSimple.typeSize +
sizeof(QDeclarativeDeclarativeData));
- ::bzero(o, instr.createSimple.typeSize + sizeof(QDeclarativeDeclarativeData));
+#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
+ ::memset(o, 0, instr.createSimple.typeSize + sizeof(QDeclarativeDeclarativeData));
+#else
+ // faster than memset
+ ::bzero(o, instr.createSimple.typeSize + sizeof(QDeclarativeDeclarativeData));
+#endif
instr.createSimple.create(o);
QDeclarativeDeclarativeData *ddata =