diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-07-11 13:49:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-27 23:08:17 +0200 |
| commit | 882c6a6cb4525a0b6cd56c185b6c16d5aad828df (patch) | |
| tree | d48748aaf6249a911521a8ca46ce7948910ca5c1 /tests | |
| parent | e81d16c6329001e3c9e2da942ed08a7c4e4fc3ee (diff) | |
Merge demos and examples.
Change-Id: Id0c975a8a3be516da66561f462511e99447d6838
Reviewed-on: http://codereview.qt.nokia.com/1420
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/guiapplauncher/demos.txt | 1 | ||||
| -rw-r--r-- | tests/auto/guiapplauncher/examples.txt | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/guiapplauncher/demos.txt b/tests/auto/guiapplauncher/demos.txt deleted file mode 100644 index e679038..0000000 --- a/tests/auto/guiapplauncher/demos.txt +++ /dev/null @@ -1 +0,0 @@ -"Browser Demo", "demos/browser", "browser", 0, 0000 diff --git a/tests/auto/guiapplauncher/examples.txt b/tests/auto/guiapplauncher/examples.txt index 11ec88e..9ade24e 100644 --- a/tests/auto/guiapplauncher/examples.txt +++ b/tests/auto/guiapplauncher/examples.txt @@ -1 +1,2 @@ -"webkit/fancybrowser Example", "examples/webkit/fancybrowser", "fancybrowser", 0, 7000 +"webkit/browser Example", "examples/browser", "browser", 0, 0000 +"webkit/fancybrowser Example", "examples/fancybrowser", "fancybrowser", 0, 7000 |