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/qdeclarativecustomparser_p_p.h | |
| 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/qdeclarativecustomparser_p_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecustomparser_p_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativecustomparser_p_p.h b/src/declarative/qml/qdeclarativecustomparser_p_p.h index b580db6..a7e213c 100644 --- a/src/declarative/qml/qdeclarativecustomparser_p_p.h +++ b/src/declarative/qml/qdeclarativecustomparser_p_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include "qdeclarativecustomparser_p.h" +#include "private/qdeclarativecustomparser_p.h" -#include "qdeclarativeparser_p.h" +#include "private/qdeclarativeparser_p.h" #include <QtCore/qglobal.h> |