summaryrefslogtreecommitdiffstats
path: root/examples/xmlpatterns/trafficinfo
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-201-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/corelib/io/qdiriterator.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h tests/auto/qxmlquery/tst_qxmlquery.cpp tools/linguist/lconvert/main.cpp
| * Update the example TrafficInfo for GCC 3.3Benjamin Poulain2009-07-171-1/+3
| | | | | | | | | | | | | | The example TrafficInfo did not compile on GCC 3.3 due to a bug in the parser of GCC. Task-number: 258208
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-169-20/+20
|\ \ | |/
| * Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-161-2/+2
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-169-18/+18
| | | | | | | | Reviewed-by: Trust Me
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-122-6/+5
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * Trafficinfo example: One more asynchronous callMarkus Goetz2009-06-111-1/+1
| | | | | | | | Task-number: 254455
| * Trafficinfo example: Asynchronous call to webservice at launchMarkus Goetz2009-06-111-5/+4
| | | | | | | | | | | | | | | | This makes the main window shown immediatly even when the webservice of traffikanten.no cannot be reached. Does not properly fix the associated task yet, e.g. display an error message. Task-number: 254455
* | Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-209-9/+9
|\ \ | |/
| * Fix incorrect copyright year in some license headers.Jason McDonald2009-05-209-9/+9
| | | | | | | | Reviewed-by: Trust Me
* | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-121-1/+1
|/ | | | We introduce this new enum, we should be using it.
* Make the traffic info example not hit the server every minute.Thiago Macieira2009-03-261-1/+1
| | | | | | | | The most frequent service in Oslo is every 5 minutes, so this should be a reasonable update interval. Let's hope that Trafikanten will stop blocking us in their firewall now. Reviewed-by: Trust Me
* Long live Qt 4.5!Lars Knoll2009-03-2313-0/+1104