diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-23 08:44:01 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-23 08:44:01 (GMT) |
| commit | ab3a625e1bc03481f740a32cdbe8c4559cf7cb1e (patch) | |
| tree | 01adb2ad207b9a2980492a24cb820925f7e48635 /src/declarative/qml/qmlengine.cpp | |
| parent | 20fc9f2e264f34dd8580949ddbe5511b78ab0ac4 (diff) | |
| parent | 48161233af2a6071bc0ba99e546da98f705b8281 (diff) | |
| download | Qt-ab3a625e1bc03481f740a32cdbe8c4559cf7cb1e.zip Qt-ab3a625e1bc03481f740a32cdbe8c4559cf7cb1e.tar.gz Qt-ab3a625e1bc03481f740a32cdbe8c4559cf7cb1e.tar.bz2 | |
Merge remote branch 'origin/master' into qtruntime
Diffstat (limited to 'src/declarative/qml/qmlengine.cpp')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index d47db9b..67d8c7d 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -51,7 +51,7 @@ #include "qmlcomponent.h" #include "qmlmetaproperty_p.h" #include "qmlmoduleplugin.h" -#include "qmlbinding_p.h" +#include "qmlbinding_p_p.h" #include "qmlvme_p.h" #include "qmlenginedebug_p.h" #include "qmlstringconverters_p.h" |