diff options
author | Glenn Watson <glenn.watson@nokia.com> | 2012-06-20 11:36:31 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 06:04:01 +0200 |
commit | 0bc4a13048c030d52fd37debba0e934e1dd49b83 (patch) | |
tree | 7184adace91130b43f310eb4c0a7982016f2885d /src/qml/qml/qqmlbundle.cpp | |
parent | 7c962ceba942f3adf2a77424d73504608a6fceac (diff) |
Fix some of the bundle test failures on Windows.
The Q_PACKED macro is not supported on Windows, so the code that
serializes the bundles does not work with the loading code. Change
the maximum bundle size to 4 GB so that struct packing is not
required.
Change-Id: Ia7c8aa856ac532732eb6e76df813f46acd66b6f2
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlbundle.cpp')
-rw-r--r-- | src/qml/qml/qqmlbundle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlbundle.cpp b/src/qml/qml/qqmlbundle.cpp index fa47cb505d..622242c0f7 100644 --- a/src/qml/qml/qqmlbundle.cpp +++ b/src/qml/qml/qqmlbundle.cpp @@ -65,7 +65,7 @@ const char *QQmlBundle::FileEntry::contents() const { return &data[fileNameLength]; } -quint64 QQmlBundle::FileEntry::fileSize() const +quint32 QQmlBundle::FileEntry::fileSize() const { return size - (sizeof(FileEntry) + fileNameLength); } @@ -174,7 +174,7 @@ bool QQmlBundle::isBundleHeader(const char *data, int size) // // find a some empty space we can use to insert new entries. // -const QQmlBundle::Entry *QQmlBundle::findInsertPoint(quint64 size, qint64 *offset) +const QQmlBundle::Entry *QQmlBundle::findInsertPoint(quint32 size, qint32 *offset) { const char *ptr = (const char *) buffer + qmlBundleHeaderLength; const char *end = (const char *) buffer + bufferSize; @@ -255,7 +255,7 @@ bool QQmlBundle::add(const QString &name, const QString &fileName) file.seek(file.size()); FileEntry cmd; - const quint64 inputFileSize = inputFile.size(); + const quint32 inputFileSize = inputFile.size(); cmd.kind = Entry::File; cmd.link = 0; @@ -298,7 +298,7 @@ bool QQmlBundle::addMetaLink(const QString &fileName, FileEntry cmd; - const quint64 inputFileSize = data.size(); + const quint32 inputFileSize = data.size(); cmd.kind = Entry::Link; cmd.link = fileEntry->link; |