summaryrefslogtreecommitdiffstats
path: root/examples/webkit
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-07270-1/+9020
|\ | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| * Added QtWebKit Guide JavaScript files.Jerome Pasion2011-03-2214-0/+897
| |
| * Adding QtWebKit Guide example images and created links to images.Jerome Pasion2011-03-22178-27/+26
| |
| * Fixed style issue and replaced image.Jerome Pasion2011-03-221-1/+1
| |
| * Adding QtWebKit Guide CSS files.Jerome Pasion2011-03-2241-0/+4271
| |
| * Edited QtWebKit Guide.Jerome Pasion2011-03-211-0/+258
| |
| * Removed compile instruction for the webkit-guide code.Jerome Pasion2011-03-181-1/+0
| |
| * Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-171-1/+2
| | | | | | | | Reviewed-by: David Boddie
| * Fixed style issues with QtWebKit guide and examples.Jerome Pasion2011-03-151-7/+7
| |
| * Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-1539-0/+3594
| | | | | | | | Added images, new doc build configurations, and example code.
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| * Doc: Fixed example project file for Symbian.David Boddie2011-02-151-0/+2
| | | | | | | | Task-number: QTBUG-15716
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1730-30/+30
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1030-30/+30
| | | | | | | | Reviewed-by: Trust Me
| * Examples: Fix compilation with namespace.Christian Kandeler2011-01-072-4/+4
| |
| * Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| |
* | compile fix for namespaced Qthjk2010-11-082-1/+5
| |
* | Fixed spelling.Rohan McGovern2010-10-251-1/+1
|/ | | | trys -> tries
* Added missing QtWebKit example files and some whitespace fixes.Jerome Pasion2010-10-095-47/+198
|
* Added the QtWebKit bridge Image Analyzer example.Jerome Pasion2010-10-0414-0/+551
| | | | | | | Originally written by Jervey Kong. Task-number: QTBUG-14154 Reviewed-by: David Boddie
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1925-689/+664
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-042-2/+2
|\ | | | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * Fixed compile of framecapture, simpleselector for symbian-abld winscw.Rohan McGovern2010-02-022-2/+2
| | | | | | | | `QT += network' is required to find the network headers.
* | Merge branch '4.6'Thiago Macieira2010-01-1327-44/+56
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Modifies the google chat example to use the DOM APIPierre Rossi2010-01-123-18/+29
| | | | | | | | | | | | Now that it's there, we might as well use it! Reviewed-by: Benjamin Poulain
| * Added the 'framecapture' WebKit example to the default build.Andre Pedralho2010-01-111-1/+2
| | | | | | | | | | | | Merge-request: 2235 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Simon Hausmann
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0925-25/+25
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits) Reverted two commits that were pushed to the wrong branch. Use the new QTextCodec api in the QXmlStreamWriter. Added new functions to QTextCodec that accept ConversionFlags. Fix passing of arguments to syncqt doc: Fixed typos. Fixes: Fix spinbox with NoButton style in QGtkStyle doc: Explained parameter value defaults where appropriate. Cocoa: Fix painting errors on QGLWidget resizing. Fix broken QGLWidget::renderPixmap on Mac/Carbon Fixes: Setting any style sheet breaks checkbox positioning Fixes: MenuItem size fixes and missing separator with Gtk+ Autotest: add a test for QNAM's HTTP cache handling code QNAM HTTP: just use the expirationDate in the code that validates the cache QNAM HTTP: change the caching semantics to match documentation QNAM HTTP: fix the caching algorithm from RFC 2616 Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner improve readability a bit more fix styling; improve readability make it possible to retrieve name of the user who owns the file Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d ) ...
| | * Update copyright year to 2010Jason McDonald2010-01-0625-25/+25
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.6'Thiago Macieira2010-01-124-2/+18
|\ \ \ | |/ /
| * | Added UIDs and icons to some webkit examplesMiikka Heikkinen2010-01-074-2/+18
| |/ | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.6'Thiago Macieira2009-12-262-4/+4
|\ \ | |/ | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * Change some examples of Webkit to create the mainwindow on the stackBenjamin Poulain2009-12-143-6/+6
| |
* | Fix memory leakDavid Faure2009-12-071-0/+1
| | | | | | | | | | Merge-request: 391 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | Merge branch '4.6'Thiago Macieira2009-11-258-33/+32
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * Namespace build fails for webkit exampleRichard Moe Gustavsen2009-11-241-0/+2
| | | | | | | | | | | | | | Forward declarations outside namespace scope will fail in this case. Reviewed-by: brad
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-201-1/+1
| |\
| | * Use a lowercase name for the binary of the Form Extractor exampleBenjamin Poulain2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | The name of the other examples are lowercase. The XML file of Qt Demo reference a lowercase name. Reviewed-by: Olivier Goffart
| * | Fixing the frame hierarchy traversing in framecapture WebKit example.Andre Pedralho2009-11-192-21/+18
| | | | | | | | | | | | | | | Merge-request: 2142 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | Updated the 'framecapture' WebKit example according to WebKit API changes.Andre Pedralho2009-11-192-4/+3
| |/ | | | | | | | | Merge-request: 2142 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-192-4/+7
| |\
| | * fancybrowser example: make sure that images are rotated for loaded pagesJocelyn Turcotte2009-11-182-4/+7
| | | | | | | | | | | | | | | | | | See QTBUG-5532. Reviewed-by: Jedrzej Nowacki
| * | Ran the script utils/normalizeOlivier Goffart2009-11-181-1/+1
| |/ | | | | | | Over src/ tools/ examples/ and demos/
| * Prospective Symbian/abld build fixSimon Hausmann2009-11-161-1/+1
| | | | | | | | | | | | | | Include QtNetwork as module to work around abld issue of local includes not working. Reviewed-by: axis
* | Merge branch '4.6'Thiago Macieira2009-11-1311-2/+599
|\ \ | |/
| * Doc: Improved WebKit example coverage.David Boddie2009-11-118-3/+317
| | | | | | | | Reviewed-by: Trust Me
| * Doc: Added an example to demonstrate the QWebElement class.David Boddie2009-11-096-1/+284
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6'Thiago Macieira2009-11-101-4/+3
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: src/gui/styles/qcommonstyle.cpp tools/assistant/lib/lib.pro tools/assistant/lib/qhelp_global.cpp tools/assistant/tools/assistant/assistant.qch tools/assistant/tools/assistant/mainwindow.cpp
| * Corrects bug in fancybrowser example where image rotation did not work.Jocelyn Turcotte2009-11-061-4/+3
| | | | | | | | | | | | | | This is actually only a workaround of what seems to be a QtWebKit bug. See QTBUG-4649. Reviewed-by: Jedrzej Nowacki
* | Add "View Page Source" and support for URL on the command lineDavid Faure2009-11-093-4/+36
|/ | | | | | | | | This example app is useful for debugging QtWebKit problems, it was just missing a way to load the url from the command-line (to avoid loading google first), and a "view page source" action. Reviewed-By: Markus Goetz Merge-Request: 2021
* Fix build error introduced in change ffeb6900.Jason McDonald2009-10-072-2/+2
| | | | | | Change ffeb6900 renamed a function but didn't rename all the calls. Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-11-27 16:49:21 (GMT)