diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-25 11:28:35 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-25 11:28:35 (GMT) |
| commit | 6729645b28f6acfeab9bb0bc488ca4143c480f5a (patch) | |
| tree | 460b440bdaa684f42f0bd8d024829673747cb727 /examples/declarative/webview/googleMaps.qml | |
| parent | ea0b7da7f5c206c436999b35bc2b55fb8863ecfe (diff) | |
| parent | 3eed4c454a58b38c895925b74e47a0b1b747df80 (diff) | |
| download | Qt-6729645b28f6acfeab9bb0bc488ca4143c480f5a.zip Qt-6729645b28f6acfeab9bb0bc488ca4143c480f5a.tar.gz Qt-6729645b28f6acfeab9bb0bc488ca4143c480f5a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
Diffstat (limited to 'examples/declarative/webview/googleMaps.qml')
| -rw-r--r-- | examples/declarative/webview/googleMaps.qml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/examples/declarative/webview/googleMaps.qml b/examples/declarative/webview/googleMaps.qml index a04fecb..a0926f5 100644 --- a/examples/declarative/webview/googleMaps.qml +++ b/examples/declarative/webview/googleMaps.qml @@ -21,6 +21,7 @@ Map { radius: 5 anchors.bottom: parent.bottom anchors.bottomMargin: 5 + opacity: map.status == "Ready" ? 1 : 0 x: 70 TextInput { id: input @@ -29,4 +30,12 @@ Map { Keys.onReturnPressed: map.address = input.text } } + Text { + id: loading + anchors.centerIn: parent + text: map.status == "Error" ? "Error" : "Loading" + opacity: map.status == "Ready" ? 0 : 1 + font.pixelSize: 30 + Behavior on opacity {NumberAnimation{}} + } } |