diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-07 00:06:28 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-07 00:06:28 (GMT) |
| commit | ca4bc7c16bdf27855a13b15dbabd8019ab2bef24 (patch) | |
| tree | c15bc918bd87994d83b87ef922da9cc17253d92d /src/declarative/qml/qdeclarativevme.cpp | |
| parent | 739c1c6a4322c0d48afd2a24e3dc2156fee577e1 (diff) | |
| parent | 71a328397720af7229fd6ee48acaa19f7339a8de (diff) | |
| download | Qt-ca4bc7c16bdf27855a13b15dbabd8019ab2bef24.zip Qt-ca4bc7c16bdf27855a13b15dbabd8019ab2bef24.tar.gz Qt-ca4bc7c16bdf27855a13b15dbabd8019ab2bef24.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativevme.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativevme.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index 487ec0c..0117880 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -39,26 +39,26 @@ ** ****************************************************************************/ -#include "qdeclarativevme_p.h" +#include "private/qdeclarativevme_p.h" -#include "qdeclarativecompiler_p.h" -#include "qdeclarativeboundsignal_p.h" -#include "qdeclarativestringconverters_p.h" -#include "qmetaobjectbuilder_p.h" -#include "qdeclarativedeclarativedata_p.h" +#include "private/qdeclarativecompiler_p.h" +#include "private/qdeclarativeboundsignal_p.h" +#include "private/qdeclarativestringconverters_p.h" +#include "private/qmetaobjectbuilder_p.h" +#include "private/qdeclarativedeclarativedata_p.h" #include "qdeclarative.h" -#include "qdeclarativecustomparser_p.h" +#include "private/qdeclarativecustomparser_p.h" #include "qdeclarativeengine.h" #include "qdeclarativecontext.h" #include "qdeclarativecomponent.h" -#include "qdeclarativebinding_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativecomponent_p.h" -#include "qdeclarativevmemetaobject_p.h" -#include "qdeclarativebinding_p_p.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativecompiledbindings_p.h" -#include "qdeclarativeglobal_p.h" +#include "private/qdeclarativebinding_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativecomponent_p.h" +#include "private/qdeclarativevmemetaobject_p.h" +#include "private/qdeclarativebinding_p_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativecompiledbindings_p.h" +#include "private/qdeclarativeglobal_p.h" #include "qdeclarativescriptstring.h" #include <QStack> |