diff options
| author | abcd <amos.choy@nokia.com> | 2012-01-27 12:28:28 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 04:40:48 +0100 |
| commit | 074260af5a59c2a6a9d49cf0b4b9e8a5db5b11f8 (patch) | |
| tree | c99d3107da3df7971e7062bbdee172c1775aeb2f /tests/auto/qmlinterface | |
| parent | 2250712e52f15dae62e74f2106e2226a42635deb (diff) | |
| download | qtlocation-074260af5a59c2a6a9d49cf0b4b9e8a5db5b11f8.tar.gz | |
Refactor Icons
Change-Id: I702e8a1b6f0e80cb990315165f1bf331a82e65a5
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'tests/auto/qmlinterface')
| -rw-r--r-- | tests/auto/qmlinterface/data/TestIcon.qml | 5 | ||||
| -rw-r--r-- | tests/auto/qmlinterface/tst_qmlinterface.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/qmlinterface/data/TestIcon.qml b/tests/auto/qmlinterface/data/TestIcon.qml index c880f352..a3c9af09 100644 --- a/tests/auto/qmlinterface/data/TestIcon.qml +++ b/tests/auto/qmlinterface/data/TestIcon.qml @@ -39,8 +39,11 @@ ** ****************************************************************************/ +import QtQuick 2.0 import QtLocation 5.0 Icon { - fullUrl: "http://www.example.com/test-icon.png" + Component.onCompleted: { + parameters.singleUrl = "http://www.example.com/test-icon.png" + } } diff --git a/tests/auto/qmlinterface/tst_qmlinterface.cpp b/tests/auto/qmlinterface/tst_qmlinterface.cpp index d17332a1..ed3c5985 100644 --- a/tests/auto/qmlinterface/tst_qmlinterface.cpp +++ b/tests/auto/qmlinterface/tst_qmlinterface.cpp @@ -123,7 +123,9 @@ tst_qmlinterface::tst_qmlinterface() m_category.setName(QLatin1String("Test category")); m_category.setCategoryId(QLatin1String("test-category-id")); - m_icon.setFullUrl(QUrl(QLatin1String("http://www.example.com/test-icon.png"))); + QVariantMap iconParams; + iconParams.insert(QPlaceIcon::SingleUrl, QUrl(QLatin1String("http://www.example.com/test-icon.png"))); + m_icon.setParameters(iconParams); m_ratings.setAverage(3.5); m_ratings.setMaximum(5.0); |