summaryrefslogtreecommitdiffstats
path: root/examples/xml
Commit message (Collapse)AuthorAgeFilesLines
* renamed examplebase.pri to symbianpkgrules.priEspen Riskedal2009-08-217-11/+11
| | | | | | | | examplesbase.pri sounded to generic and it was not obvious that this was only for Symbian. Also merged the different symbian rules if they were spread around in the .pro file. Reviewed-by: Aleksandar Sasha Babic
* Merge commit 'qt/master'Jason Barron2009-08-205-55/+57
|\ | | | | | | | | | | | | | | Conflicts: examples/painting/svgviewer/files/bubbles.svg src/corelib/kernel/qobject.cpp src/network/kernel/qhostinfo.cpp tests/auto/qhostinfo/tst_qhostinfo.cpp
| * Changed the streambookmarks example to use aggregationThorbjørn Lindeijer2009-08-195-50/+62
| | | | | | | | | | | | | | | | QXmlStreamReader and QXmlStreamWriter can be used conveniently without subclassing, which the example now demonstrates. Reviewed-by: mae Reviewed-by: David Boddie
| * Revert re-adding of readUnknownElementThorbjørn Lindeijer2009-08-192-10/+0
| | | | | | | | | | Now that it is really no longer used. QXmlStreamReader::skipCurrentElement replaces it.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-191-65/+35
|\ \ | |/ | | | | | | Conflicts: tests/auto/auto.pro
| * Fixed compile errorThorbjørn Lindeijer2009-08-191-1/+1
| | | | | | | | Apparently I forgot one occurrence.
| * Fixes compileBill King2009-08-192-0/+10
| |
| * Added two convenience functions to QXmlStreamReaderThorbjørn Lindeijer2009-08-182-74/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QXmlStreamReader::readNextStartElement reads until the next start element within the current element, or returns false when no such element is encountered before the end element is reached. It simplifies the common case of iterating over the elements in an XML document. QXmlStreamReader::skipCurrentElement reads until the end element of the current element, skipping any child elements. This functionality was requested in two tasks, and a similar function 'readUnknownElement' was present in Qt's stream reader example. Autotest is included, example and documentation have been updated. Task-number: 238793 Reviewed-by: mae
* | Changed names and URLs to reflect name change.axis2009-08-192-3/+3
| | | | | | | | RevBy: Trust me
* | Merge commit 'qt/master'Jason Barron2009-08-1329-57/+57
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-122-2/+2
| | | | | | | | Reviewed-by: Trust Me
| * Update obsolete URL's in code and docs.Jason McDonald2009-08-121-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Update references to online documentation.Jason McDonald2009-08-126-15/+15
| | | | | | | | Reviewed-by: Trust Me
| * Update URL's to use new domain.Jason McDonald2009-08-126-16/+16
| | | | | | | | Reviewed-by: Trust Me
| * Update contact URL in license headers.Jason McDonald2009-08-1223-23/+23
| | | | | | | | Reviewed-by: Trust Me
* | Update license headers according to commit 858c70f768e.axis2009-08-061-3/+3
| | | | | | | | RevBy: Trust me
* | Replaced $MODULE$ with hardcoded module names.axis2009-08-061-1/+1
| | | | | | | | RevBy: Trust me
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3023-46/+46
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-1623-46/+46
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1623-46/+46
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Long live Qt 4.5!Lars Knoll2009-03-2336-0/+3607
| |
* | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-253-9/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-123-9/+9
| | | | | | | | We introduce this new enum, we should be using it.
| * Long live Qt!Lars Knoll2009-03-2336-0/+3607
|
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-031-1/+31
|\
| * Fixed incorrect headers.axis2009-06-031-1/+31
| |
* | Removed old workaround for S60 emulator deployment bug with saxbookmarks ↵Miikka Heikkinen2009-06-032-323/+0
|/ | | | xbel files.
* Long live Qt for S60!axis2009-04-2446-0/+7620