diff options
author | Jason Barron <jbarron@trolltech.com> | 2009-06-30 09:21:56 (GMT) |
---|---|---|
committer | Jason Barron <jbarron@trolltech.com> | 2009-06-30 09:21:56 (GMT) |
commit | 197df24edfe095a10e2bf65116796e027fea44e2 (patch) | |
tree | 4ffb08f614b550298663f90297c9e559ecb47a3c /examples/gestures/browser/data/defaultbookmarks.xbel | |
parent | 1e84894225e31adf80a7a33da7f655fb5c38ea0e (diff) | |
parent | e3c1039d4d10aa383a1f681e7dd9c1129d22d8ca (diff) | |
download | Qt-197df24edfe095a10e2bf65116796e027fea44e2.zip Qt-197df24edfe095a10e2bf65116796e027fea44e2.tar.gz Qt-197df24edfe095a10e2bf65116796e027fea44e2.tar.bz2 |
Merge commit 'qt/master-stable' into 4.6-merged
Conflicts:
.gitignore
configure.exe
src/corelib/concurrent/qtconcurrentthreadengine.h
src/corelib/global/qnamespace.h
src/gui/graphicsview/qgraphicssceneevent.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qapplication_p.h
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qwidget.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
src/network/access/qnetworkaccesshttpbackend.cpp
tests/auto/network-settings.h
tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
tests/auto/qvariant/tst_qvariant.cpp
Diffstat (limited to 'examples/gestures/browser/data/defaultbookmarks.xbel')
-rw-r--r-- | examples/gestures/browser/data/defaultbookmarks.xbel | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/examples/gestures/browser/data/defaultbookmarks.xbel b/examples/gestures/browser/data/defaultbookmarks.xbel new file mode 100644 index 0000000..a168244 --- /dev/null +++ b/examples/gestures/browser/data/defaultbookmarks.xbel @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE xbel> +<xbel version="1.0"> + <folder folded="yes"> + <title>Bookmarks Bar</title> + <bookmark href="http://qtsoftware.com/"> + <title>Qt Software</title> + </bookmark> + <bookmark href="http://webkit.org/"> + <title>WebKit.org</title> + </bookmark> + <bookmark href="http://doc.trolltech.com/"> + <title>Qt Documentation</title> + </bookmark> + <bookmark href="http://doc.trolltech.com/qq/"> + <title>Qt Quarterly</title> + </bookmark> + <bookmark href="http://labs.trolltech.com/"> + <title>Qt Labs</title> + </bookmark> + <bookmark href="http://www.qtcentre.org/"> + <title>Qt Centre</title> + </bookmark> + <bookmark href="http://qt-apps.org/"> + <title>Qt-Apps.org</title> + </bookmark> + <bookmark href="http://qtnode.net/"> + <title>qtnode</title> + </bookmark> + <bookmark href="http://xkcd.com/"> + <title>xkcd</title> + </bookmark> + </folder> + <folder folded="yes"> + <title>Bookmarks Menu</title> + <bookmark href="http://reddit.com/"> + <title>reddit.com: what's new online!</title> + </bookmark> + </folder> +</xbel> |