diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-24 07:49:15 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-24 07:49:15 (GMT) |
| commit | f4b73327cdddd14e29c542e392377cf7261d28ca (patch) | |
| tree | e57845768a21ee7eae2cd7693e0b0d8f68a544ca /tests | |
| parent | d3a0bd57c7c3cecdeeb4ad9af3cf6bb4ee39964b (diff) | |
| parent | b0005461049e6d69f7e79e7d9311e9beabfe8c39 (diff) | |
| download | Qt-f4b73327cdddd14e29c542e392377cf7261d28ca.zip Qt-f4b73327cdddd14e29c542e392377cf7261d28ca.tar.gz Qt-f4b73327cdddd14e29c542e392377cf7261d28ca.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'tests')
9 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml index ce05f89..ce05f89 100644 --- a/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml +++ b/tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml index 429c327..429c327 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml diff --git a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml index 0f57b61..0f57b61 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt index 85c8396..f8297f5 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt +++ b/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt @@ -1 +1 @@ -4:5:QmlJS declaration outside Script element +4:5:JavaScript declaration outside Script element diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h index 1a8bd11..fc1ede7 100644 --- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h +++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h @@ -52,6 +52,7 @@ #include <QtDeclarative/qdeclarativeparserstatus.h> #include <QtDeclarative/qdeclarativepropertyvaluesource.h> #include <QtDeclarative/qdeclarativescriptstring.h> +#include <QtDeclarative/qdeclarativemetaproperty.h> QVariant myCustomVariantTypeConverter(const QString &data); diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index 9d68ba9..16af0d9 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -41,6 +41,7 @@ #include <qtest.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativemetatype.h> #include <QtCore/qfile.h> #include <QtCore/qdebug.h> #include <QtCore/qfileinfo.h> diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp index 03d641d..5c6ceef 100644 --- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp +++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp @@ -47,6 +47,7 @@ #include <QDeclarativeComponent> #include <QtDeclarative/qdeclarative.h> #include <QtDeclarative/qdeclarativeprivate.h> +#include <QtDeclarative/qdeclarativemetaproperty.h> #include <QDebug> inline QUrl TEST_FILE(const QString &filename) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp index 6433791..154693c 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp @@ -38,6 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ +#include <QStringList> #include <QtDeclarative/qdeclarativeextensionplugin.h> #include <QtDeclarative/qdeclarative.h> #include <QDebug> diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h index c4a9187..8b80e16 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h +++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h @@ -52,6 +52,7 @@ #include <QFont> #include <qdeclarative.h> #include <QDeclarativePropertyValueSource> +#include <QDeclarativeMetaProperty> class MyTypeObject : public QObject { |