summaryrefslogtreecommitdiffstats
path: root/examples/webkit
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Use the unified toolbar on Mac.Morten Sørvig2009-06-182-0/+2
| | |
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-1616-32/+32
| |\ \ | | |/
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1616-32/+32
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Ported the FormExtractor example to use the new QWebElementSimon Hausmann2009-06-153-32/+25
| | | | | | | | | | | | Reviewed-by: Tor Arne
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-253-5/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Compile fix with namespaces.hjk2009-05-281-1/+1
| | |
| * | Merge commit 'origin/4.5'Olivier Goffart2009-05-132-2/+22
| |\ \ | | |/
| * | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-122-4/+4
| | | | | | | | | | | | We introduce this new enum, we should be using it.
* | | Compilation fix. Added missing network dependencyMarkku Luukkainen2009-06-184-8/+8
| | |
* | | Added proper UID for webkit examples and browser demoMiikka Heikkinen2009-06-174-0/+8
| | |
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-182-2/+22
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/kernel/qcoreapplication.cpp Configure.exe not rebuilt because the changes are irrelevant for the S60 port. We'll rebuild it before merging back.
| * | Adding documentation to the fancy browser exampleMorten Engvoldsen2009-05-122-2/+22
| |/ | | | | | | | | | | | | | | Added documentation to the fancy browser example. Task-number:252097 Rev-by: Geir Vattekar Rev-by: Ariya Hidayat
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-2712-1/+842
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure.exe recompiled with MSVC6. Conflicts: configure.exe examples/network/network.pro src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qfilesystemmodel_p.h src/gui/kernel/qapplication.cpp tests/auto/_Categories/qmake.txt tests/auto/qfile/test/test.pro tests/auto/qfile/tst_qfile.cpp tests/auto/qlibrary/tst_qlibrary.cpp tests/auto/qline/tst_qline.cpp tests/auto/qstyle/tst_qstyle.cpp tests/auto/qtextstream/tst_qtextstream.cpp tests/auto/qtranslator/qtranslator.pro tests/auto/qwaitcondition/tst_qwaitcondition.cpp translations/qt_ja_JP.ts
| * Added Google Chat client as a new WebKit exampleAriya Hidayat2009-04-236-1/+512
| | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * Add fancy browser as the new exampleAriya Hidayat2009-04-237-1/+331
| | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * Long live Qt 4.5!Lars Knoll2009-03-2317-0/+1188
|
* Long live Qt for S60!axis2009-04-2417-0/+1194