diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-04-24 04:29:31 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-04-24 04:29:31 (GMT) |
| commit | 0c5f0baa59ae56749707c9f73754132cd9b4a44d (patch) | |
| tree | cc8e8ca8d889a64ee5cdaa91647b2cf221c8edf3 /demos/declarative/webbrowser/content | |
| parent | 363265d790c9f6b69d5a706209b28e467de3a2d6 (diff) | |
| parent | db815819dae525c64575de38b92afa4cf092ce06 (diff) | |
| download | Qt-0c5f0baa59ae56749707c9f73754132cd9b4a44d.zip Qt-0c5f0baa59ae56749707c9f73754132cd9b4a44d.tar.gz Qt-0c5f0baa59ae56749707c9f73754132cd9b4a44d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
demos/declarative/webbrowser/WebBrowser.qml
demos/declarative/webbrowser/content/pics/addressbar-filled.png
demos/declarative/webbrowser/content/pics/addressbar.png
demos/declarative/webbrowser/content/pics/back-disabled.png
demos/declarative/webbrowser/content/pics/back.png
demos/declarative/webbrowser/content/pics/footer.png
demos/declarative/webbrowser/content/pics/forward-disabled.png
demos/declarative/webbrowser/content/pics/forward.png
demos/declarative/webbrowser/content/pics/header.png
demos/declarative/webbrowser/content/pics/reload.png
Diffstat (limited to 'demos/declarative/webbrowser/content')
| -rw-r--r-- | demos/declarative/webbrowser/content/pics/addressbar-filled.png | bin | 1071 -> 694 bytes |
| -rw-r--r-- | demos/declarative/webbrowser/content/pics/addressbar.png | bin | 1001 -> 467 bytes |
| -rw-r--r-- | demos/declarative/webbrowser/content/pics/back-disabled.png | bin | 2546 -> 475 bytes |
| -rw-r--r-- | demos/declarative/webbrowser/content/pics/back.png | bin | 1271 -> 707 bytes |
| -rw-r--r-- | demos/declarative/webbrowser/content/pics/footer.png | bin | 267 -> 200 bytes |
| -rw-r--r-- | demos/declarative/webbrowser/content/pics/forward-disabled.png | bin | 2535 -> 471 bytes |
| -rw-r--r-- | demos/declarative/webbrowser/content/pics/forward.png | bin | 1267 -> 682 bytes |
| -rw-r--r-- | demos/declarative/webbrowser/content/pics/header.png | bin | 287 -> 193 bytes |
| -rw-r--r-- | demos/declarative/webbrowser/content/pics/reload.png | bin | 1611 -> 1283 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/demos/declarative/webbrowser/content/pics/addressbar-filled.png b/demos/declarative/webbrowser/content/pics/addressbar-filled.png Binary files differindex 2abcb0c..d8452ec 100644 --- a/demos/declarative/webbrowser/content/pics/addressbar-filled.png +++ b/demos/declarative/webbrowser/content/pics/addressbar-filled.png diff --git a/demos/declarative/webbrowser/content/pics/addressbar.png b/demos/declarative/webbrowser/content/pics/addressbar.png Binary files differindex f5cf17e..3278f58 100644 --- a/demos/declarative/webbrowser/content/pics/addressbar.png +++ b/demos/declarative/webbrowser/content/pics/addressbar.png diff --git a/demos/declarative/webbrowser/content/pics/back-disabled.png b/demos/declarative/webbrowser/content/pics/back-disabled.png Binary files differindex 281b6f3..91b9e76 100644 --- a/demos/declarative/webbrowser/content/pics/back-disabled.png +++ b/demos/declarative/webbrowser/content/pics/back-disabled.png diff --git a/demos/declarative/webbrowser/content/pics/back.png b/demos/declarative/webbrowser/content/pics/back.png Binary files differindex e6546c2..9988dd3 100644 --- a/demos/declarative/webbrowser/content/pics/back.png +++ b/demos/declarative/webbrowser/content/pics/back.png diff --git a/demos/declarative/webbrowser/content/pics/footer.png b/demos/declarative/webbrowser/content/pics/footer.png Binary files differindex ae68bf7..8391a93 100644 --- a/demos/declarative/webbrowser/content/pics/footer.png +++ b/demos/declarative/webbrowser/content/pics/footer.png diff --git a/demos/declarative/webbrowser/content/pics/forward-disabled.png b/demos/declarative/webbrowser/content/pics/forward-disabled.png Binary files differindex f32841a..cb87f4f 100644 --- a/demos/declarative/webbrowser/content/pics/forward-disabled.png +++ b/demos/declarative/webbrowser/content/pics/forward-disabled.png diff --git a/demos/declarative/webbrowser/content/pics/forward.png b/demos/declarative/webbrowser/content/pics/forward.png Binary files differindex 2da9631..83870ee 100644 --- a/demos/declarative/webbrowser/content/pics/forward.png +++ b/demos/declarative/webbrowser/content/pics/forward.png diff --git a/demos/declarative/webbrowser/content/pics/header.png b/demos/declarative/webbrowser/content/pics/header.png Binary files differindex 7211bfc..26588c3 100644 --- a/demos/declarative/webbrowser/content/pics/header.png +++ b/demos/declarative/webbrowser/content/pics/header.png diff --git a/demos/declarative/webbrowser/content/pics/reload.png b/demos/declarative/webbrowser/content/pics/reload.png Binary files differindex a4fca0c..45b5535 100644 --- a/demos/declarative/webbrowser/content/pics/reload.png +++ b/demos/declarative/webbrowser/content/pics/reload.png |
