diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-13 23:31:53 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-13 23:31:53 (GMT) |
| commit | 6ee86ddfcf5ff5fe0aadc835101c1e6f46b2a126 (patch) | |
| tree | c7847f428c83592747b62cef82906d458bc136c9 /src/declarative | |
| parent | 9416f29a3ee7511c182eaa68f5523132ff64921d (diff) | |
| parent | a5e9e86a6daddde6fb906cbf09bf562e50b17698 (diff) | |
| download | Qt-6ee86ddfcf5ff5fe0aadc835101c1e6f46b2a126.zip Qt-6ee86ddfcf5ff5fe0aadc835101c1e6f46b2a126.tar.gz Qt-6ee86ddfcf5ff5fe0aadc835101c1e6f46b2a126.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompositetypemanager.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativevme.cpp | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/declarative/qml/qdeclarativecompositetypemanager.cpp b/src/declarative/qml/qdeclarativecompositetypemanager.cpp index d1ebe9a..133b71f 100644 --- a/src/declarative/qml/qdeclarativecompositetypemanager.cpp +++ b/src/declarative/qml/qdeclarativecompositetypemanager.cpp @@ -723,7 +723,7 @@ void QDeclarativeCompositeTypeManager::compile(QDeclarativeCompositeTypeData *un } } - QUrl importUrl = unit->imports.baseUrl().resolved(QUrl("qmldir")); + QUrl importUrl = unit->imports.baseUrl().resolved(QUrl(QLatin1String("qmldir"))); if (toLocalFileOrQrc(importUrl).isEmpty()) resourceList.prepend(importUrl); diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index 0addfabd..3575c17 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -246,12 +246,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, { QObject *o = (QObject *)operator new(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 = |