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/qdeclarativecompiler.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/qdeclarativecompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 27fecfb..b12d6f4 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -39,33 +39,33 @@ ** ****************************************************************************/ -#include "qdeclarativecompiler_p.h" +#include "private/qdeclarativecompiler_p.h" -#include "qdeclarativecompositetypedata_p.h" -#include "qdeclarativeparser_p.h" -#include "qdeclarativescriptparser_p.h" +#include "private/qdeclarativecompositetypedata_p.h" +#include "private/qdeclarativeparser_p.h" +#include "private/qdeclarativescriptparser_p.h" #include "qdeclarativepropertyvaluesource.h" #include "qdeclarativecomponent.h" -#include "qmetaobjectbuilder_p.h" -#include "qdeclarativestringconverters_p.h" -#include "qdeclarativeengine_p.h" +#include "private/qmetaobjectbuilder_p.h" +#include "private/qdeclarativestringconverters_p.h" +#include "private/qdeclarativeengine_p.h" #include "qdeclarativeengine.h" #include "qdeclarativecontext.h" -#include "qdeclarativemetatype_p.h" -#include "qdeclarativecustomparser_p_p.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativecomponent_p.h" +#include "private/qdeclarativemetatype_p.h" +#include "private/qdeclarativecustomparser_p_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativecomponent_p.h" #include "parser/qdeclarativejsast_p.h" -#include "qdeclarativevmemetaobject_p.h" -#include "qdeclarativeexpression_p.h" -#include "qdeclarativeproperty_p.h" -#include "qdeclarativerewrite_p.h" +#include "private/qdeclarativevmemetaobject_p.h" +#include "private/qdeclarativeexpression_p.h" +#include "private/qdeclarativeproperty_p.h" +#include "private/qdeclarativerewrite_p.h" #include "qdeclarativescriptstring.h" -#include "qdeclarativeglobal_p.h" -#include "qdeclarativescriptparser_p.h" -#include "qdeclarativebinding_p.h" -#include "qdeclarativecompiledbindings_p.h" -#include "qdeclarativeglobalscriptclass_p.h" +#include "private/qdeclarativeglobal_p.h" +#include "private/qdeclarativescriptparser_p.h" +#include "private/qdeclarativebinding_p.h" +#include "private/qdeclarativecompiledbindings_p.h" +#include "private/qdeclarativeglobalscriptclass_p.h" #include <QCoreApplication> #include <QColor> |