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/qv4stringobject.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/qv4stringobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4stringobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index d7f786f39d..91d5bc3d78 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -38,7 +38,7 @@ #include "qv4objectproto_p.h" #include <private/qv4mm_p.h> #include "qv4scopedvalue_p.h" - +#include "qv4alloca_p.h" #include <QtCore/QDateTime> #include <QtCore/QDebug> #include <QtCore/QStringList> |