diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:13:37 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:13:38 +0100 |
| commit | 6dbf435ca46e87893dc46b3f7f09a95f29998e3e (patch) | |
| tree | 840394a855c4b0df25637c2c0d90ef13d228af80 /src/qml/jsruntime/qv4persistent.cpp | |
| parent | a6c752333d6dbe76e07db39684fdb878f5fbf865 (diff) | |
| parent | 4d8b9373c62b9b58c54548f41f1e9d84e9522c6e (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I94f8ae93d76bd5c120de25d9c238701afe8bfbd0
Diffstat (limited to 'src/qml/jsruntime/qv4persistent.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4persistent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4persistent.cpp b/src/qml/jsruntime/qv4persistent.cpp index 83cee5cd0d..0889415a28 100644 --- a/src/qml/jsruntime/qv4persistent.cpp +++ b/src/qml/jsruntime/qv4persistent.cpp @@ -50,7 +50,7 @@ struct Header { int freeList; }; -static const int kEntriesPerPage = (WTF::pageSize() - sizeof(Header)) / sizeof(Value); +static const int kEntriesPerPage = int((WTF::pageSize() - sizeof(Header)) / sizeof(Value)); struct Page { Header header; |