diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-20 01:45:05 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-20 01:45:05 (GMT) |
| commit | 07908701ea4e8c998cee111b3e11aeff1bf26bf7 (patch) | |
| tree | 4e8da6b8809f95d42915071a192ebae89cca96fd /src/declarative/qml/script | |
| parent | e6fa564cb2f562eaca675872c08af14614a76283 (diff) | |
| parent | 7f872ea70d357788bbda18f28d4765d5c3a1510e (diff) | |
| download | Qt-07908701ea4e8c998cee111b3e11aeff1bf26bf7.zip Qt-07908701ea4e8c998cee111b3e11aeff1bf26bf7.tar.gz Qt-07908701ea4e8c998cee111b3e11aeff1bf26bf7.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/script')
| -rw-r--r-- | src/declarative/qml/script/lexer.h | 2 | ||||
| -rw-r--r-- | src/declarative/qml/script/qmlbasicscript.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/qml/script/lexer.h b/src/declarative/qml/script/lexer.h index 7781ee8..9de4afd 100644 --- a/src/declarative/qml/script/lexer.h +++ b/src/declarative/qml/script/lexer.h @@ -11,7 +11,7 @@ #ifndef LEXER_H #define LEXER_H -#include <QList> +#include <QtCore/QList> #include "tokens.h" diff --git a/src/declarative/qml/script/qmlbasicscript.h b/src/declarative/qml/script/qmlbasicscript.h index d465f04..5ef2148 100644 --- a/src/declarative/qml/script/qmlbasicscript.h +++ b/src/declarative/qml/script/qmlbasicscript.h @@ -13,10 +13,10 @@ #define QMLBASICSCRIPT_H #include "instructions.h" -#include <QList> -#include <QByteArray> +#include <QtCore/QList> +#include <QtCore/QByteArray> #include "lexer.h" -#include <QVariant> +#include <QtCore/QVariant> QT_BEGIN_HEADER |