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/extra | |
| 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/extra')
| -rw-r--r-- | src/declarative/extra/qfxintegermodel.h | 6 | ||||
| -rw-r--r-- | src/declarative/extra/qmlnumberformatter.h | 4 | ||||
| -rw-r--r-- | src/declarative/extra/qmlsqlconnection.h | 4 | ||||
| -rw-r--r-- | src/declarative/extra/qmlsqlquery.h | 4 | ||||
| -rw-r--r-- | src/declarative/extra/qmlxmllistmodel.h | 4 | ||||
| -rw-r--r-- | src/declarative/extra/qnumberformat.h | 6 |
6 files changed, 14 insertions, 14 deletions
diff --git a/src/declarative/extra/qfxintegermodel.h b/src/declarative/extra/qfxintegermodel.h index 3a48a56..2f5c756 100644 --- a/src/declarative/extra/qfxintegermodel.h +++ b/src/declarative/extra/qfxintegermodel.h @@ -42,9 +42,9 @@ #ifndef QFXINTMODEL_H #define QFXINTMODEL_H -#include <QObject> -#include "qml.h" -#include <qlistmodelinterface.h> +#include <QtCore/QObject> +#include <QtDeclarative/qml.h> +#include <QtDeclarative/qlistmodelinterface.h> QT_BEGIN_HEADER diff --git a/src/declarative/extra/qmlnumberformatter.h b/src/declarative/extra/qmlnumberformatter.h index e053be5..cdd6b58 100644 --- a/src/declarative/extra/qmlnumberformatter.h +++ b/src/declarative/extra/qmlnumberformatter.h @@ -42,8 +42,8 @@ #ifndef QMLNUMBERFORMATTER_H #define QMLNUMBERFORMATTER_H -#include <qml.h> -#include "qnumberformat.h" +#include <QtDeclarative/qml.h> +#include <QtDeclarative/qnumberformat.h> QT_BEGIN_HEADER diff --git a/src/declarative/extra/qmlsqlconnection.h b/src/declarative/extra/qmlsqlconnection.h index 2cc5774..0fff1b0 100644 --- a/src/declarative/extra/qmlsqlconnection.h +++ b/src/declarative/extra/qmlsqlconnection.h @@ -42,8 +42,8 @@ #ifndef QMLSQLCONNECTION_H #define QMLSQLCONNECTION_H -#include <qml.h> -#include <QSqlDatabase> +#include <QtDeclarative/qml.h> +#include <QtSql/QSqlDatabase> QT_BEGIN_HEADER diff --git a/src/declarative/extra/qmlsqlquery.h b/src/declarative/extra/qmlsqlquery.h index 984483c..3fff127 100644 --- a/src/declarative/extra/qmlsqlquery.h +++ b/src/declarative/extra/qmlsqlquery.h @@ -42,8 +42,8 @@ #ifndef QMLSQLQUERYMODEL_H #define QMLSQLQUERYMODEL_H -#include <qml.h> -#include <QListModelInterface> +#include <QtDeclarative/qml.h> +#include <QtDeclarative/QListModelInterface> QT_BEGIN_HEADER diff --git a/src/declarative/extra/qmlxmllistmodel.h b/src/declarative/extra/qmlxmllistmodel.h index 2e932cb..9371448 100644 --- a/src/declarative/extra/qmlxmllistmodel.h +++ b/src/declarative/extra/qmlxmllistmodel.h @@ -42,8 +42,8 @@ #ifndef QMLXMLLISTMODEL_H #define QMLXMLLISTMODEL_H -#include <qml.h> -#include <QListModelInterface> +#include <QtDeclarative/qml.h> +#include <QtDeclarative/QListModelInterface> QT_BEGIN_HEADER diff --git a/src/declarative/extra/qnumberformat.h b/src/declarative/extra/qnumberformat.h index 6ee333c..75224ec 100644 --- a/src/declarative/extra/qnumberformat.h +++ b/src/declarative/extra/qnumberformat.h @@ -42,9 +42,9 @@ #ifndef NUMBERFORMAT_H #define NUMBERFORMAT_H -#include "qml.h" -#include <QtGui> - +#include <QtDeclarative/qml.h> +#include <QtCore/QLocale> +#include <QtCore/QTime> QT_BEGIN_HEADER |