diff options
| author | Juha Vuolle <juha.vuolle@nokia.com> | 2011-12-15 15:57:49 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-16 14:40:37 +0100 |
| commit | c5ed412f20fbf98bbbd74a56326baa892c97e852 (patch) | |
| tree | 6a3973327cb863760fd2170c6cffe70db545a7bc /tests/applications | |
| parent | 968a6a1dc0b7551ee73322e87566f3aad1a9710d (diff) | |
Autotest improvements and additions.
* Part of tests disabled (see QTBUG-23201)
* Removed some testcase build- and runtime warnings.
* Made one testcase less timing sensitive (unstable).
* Some new map item tests.
Change-Id: I238f921410c665996b2db1b098716476873a4f02
Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
Diffstat (limited to 'tests/applications')
| -rw-r--r-- | tests/applications/declarative_map/map3d.pro | 2 | ||||
| -rw-r--r-- | tests/applications/declarative_map/map3d.qml | 4 | ||||
| -rw-r--r-- | tests/applications/declarative_map/qmlmap3d.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/applications/declarative_map/map3d.pro b/tests/applications/declarative_map/map3d.pro index 16ad1c66..b1da90cf 100644 --- a/tests/applications/declarative_map/map3d.pro +++ b/tests/applications/declarative_map/map3d.pro @@ -1,7 +1,7 @@ TARGET = qml_location_map3d TEMPLATE=app -QT += declarative network widgets +QT += network widgets quick SOURCES += qmlmap3d.cpp diff --git a/tests/applications/declarative_map/map3d.qml b/tests/applications/declarative_map/map3d.qml index a9d98054..b0101651 100644 --- a/tests/applications/declarative_map/map3d.qml +++ b/tests/applications/declarative_map/map3d.qml @@ -43,8 +43,8 @@ import QtLocation 5.0 import QtLocation.test 5.0 import "common" as Common -import Qt3D 1.0 -import Qt.multimediakit 4.0 +//import Qt3D 1.0 +//import Qt.multimediakit 4.0 Rectangle { objectName: "The page." diff --git a/tests/applications/declarative_map/qmlmap3d.cpp b/tests/applications/declarative_map/qmlmap3d.cpp index 6892bea4..af34f2c5 100644 --- a/tests/applications/declarative_map/qmlmap3d.cpp +++ b/tests/applications/declarative_map/qmlmap3d.cpp @@ -42,7 +42,7 @@ #include <QtCore/QStringList> #include <QtDeclarative/QDeclarativeEngine> #include <QNetworkProxy> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> // QML2 app |