summaryrefslogtreecommitdiff
path: root/examples/webkit
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-31146-473/+473
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Updated year in copyright headerKai Koehne2014-03-26146-146/+146
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Ensure the webftp example works with newer versions of webkit.Richard J. Moore2014-02-081-1/+1
| | | | | | | | | | | | The code currently has a bug that it will return the incorrect number for bytesAvailable() since it doesn't take account of the QIODevice buffer. This fails when peek() is called (which is used by newer webkits). See QTBUG-27469 for an example of the problem. Note this example does not exist in qt5 so this is not a backport. Change-Id: Ic61248d0f36db6a6a65d0c48a8f40346dc7c3cb6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Replaced Nokia copyrights in headerTeemu Kaukoranta2013-07-1037-74/+73
| | | | | | | | | | | | | | | | | | | | | | | | | Replaced old Nokia copyrights with Digia copyrights. Removed "All rights reserved" strings without leading copyrights were removed (for example, 'Copyright SomeCompany, all rights reserved remain untouched). Did NOT touch contact details, will change them later. Excluded folders that have '3rdparty' in path. Used command: find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*' {} \; | tee >(xargs sed -i -r '1,10 s/([ #*]*)(.*Copyright.*Nokia.*)/ \1Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I') >(xargs sed -i -r '1,10 s/(^[ #*]*)(all rights reserved.*)/\1/I') This excludes binary files and retains whitespace and #* characters in the beginning of the edited lines. Fixed "all rights reserved" that didn't get removed completely. Change-Id: Iec19ee5ca4fd7e0735a234955fe1648f1f71d206 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-13109-109/+109
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-29109-662/+662
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-01108-216/+216
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Change bugreports.qt.nokia.com -> bugreports.qt-project.orgSergio Ahumada2012-02-091-1/+1
| | | | | | Change-Id: Ib13737eac7f7cee3ebca44aa712cb6b152672a81 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1139-39/+39
| | | | | | | | Manually update strings that did not get fixed by previous search-and-replace. Change-Id: Ie9ff57f08ce0dcf91d28620fa2dc9eeb8e98481e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-11108-108/+108
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix permission (no execute bit).Frederik Gladhorn2011-11-22190-0/+0
|
* Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-063-2/+11
| | | | | Merge-Request: 1291 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-181-2/+2
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-151-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/fancybrowser.pro src/3rdparty/libpng/ANNOUNCE src/3rdparty/libpng/CHANGES src/3rdparty/libpng/CMakeLists.txt src/3rdparty/libpng/LICENSE src/3rdparty/libpng/README src/3rdparty/libpng/configure.ac src/3rdparty/libpng/example.c src/3rdparty/libpng/libpng-manual.txt src/3rdparty/libpng/libpng.3 src/3rdparty/libpng/libpngpf.3 src/3rdparty/libpng/png.5 src/3rdparty/libpng/png.c src/3rdparty/libpng/png.h src/3rdparty/libpng/pngconf.h src/3rdparty/libpng/pngerror.c src/3rdparty/libpng/pnginfo.h src/3rdparty/libpng/pnglibconf.h src/3rdparty/libpng/pngmem.c src/3rdparty/libpng/pngpread.c src/3rdparty/libpng/pngpriv.h src/3rdparty/libpng/pngread.c src/3rdparty/libpng/pngrtran.c src/3rdparty/libpng/pngrutil.c src/3rdparty/libpng/pngset.c src/3rdparty/libpng/pngstruct.h src/3rdparty/libpng/pngtest.c src/3rdparty/libpng/pngtrans.c src/3rdparty/libpng/pngvalid.c src/3rdparty/libpng/pngwrite.c src/3rdparty/libpng/pngwtran.c src/3rdparty/libpng/pngwutil.c src/gui/dialogs/qfiledialog_symbian.cpp src/gui/kernel/qsoftkeymanager.cpp src/s60installs/s60installs.pro
| | * Fix fancybrowser.proShane Kearns2011-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Somehow, the latin-1 multiply symbol was used instead of an 'x' in hex literals. Task-number: QTBUG-15716 Reviewed-by: mread
* | | examples: fix compilation with namespaced Qt.hjk2011-08-157-3/+11
|/ /
* | Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-2259-12/+2651
|\ \
| * | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-2827-12/+484
| | | | | | | | | | | | (4.7-generated-declarative branch).
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-04-18270-0/+9021
| |\ \ | | | | | | | | | | | | | | | | Conflicts: examples/webkit/webkit.pro
| * | | Added missing resource files.David Boddie2011-04-142-0/+12
| | | |
| * | | Added missing data files. Renamed resource files.David Boddie2011-04-138-14/+115
| | | |
| * | | Fixed whitespace in examples.David Boddie2011-03-255-5/+5
| | | |
| * | | Doc: Added QtWebKit examples from Qt Quarterly 26 and 32.David Boddie2011-03-1029-1/+2055
| | | |
* | | | Fix build of Fancy Browser demo.Alexis Menard2011-06-021-0/+1
| |/ / |/| | | | | | | | Reviewed-by: Andreas Kling
* | | 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-1130-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
View Lorry Controller Status