summaryrefslogtreecommitdiffstats
path: root/demos/declarative/webbrowser
Commit message (Collapse)AuthorAgeFilesLines
* Updated year in copyright headerKai Koehne2014-03-267-7/+7
| | | | | | | | | | | | | | | | | | 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>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-137-7/+7
| | | | | | 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-297-150/+150
| | | | | | | | 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-017-14/+14
| | | | | | | | | | | | | - 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>
* Update year in Nokia copyright messages.Jason McDonald2012-01-117-7/+7
| | | | | | | | | 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>
* Declarative Examples: Fall back to local qmlapplicationviewer.Daniel Molkentin2011-11-221-1/+2
| | | | Rubberstamped-by: Oswald Buddenhagen
* Fix use of qmlapplicationviewer.Daniel Molkentin2011-11-211-1/+2
| | | | | | | - Two separate copies for demos and example - Fix deployment (don't install to opt in desktop case) Reviewed-by: Casper van Donderen
* demos/declarative/webbrowser example modificationsartoka2011-11-1722-3/+209
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-136-102/+102
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-196-6/+6
|\
| * Update copyright year to 2011.Jason McDonald2011-01-106-6/+6
| | | | | | | | Reviewed-by: Trust Me
* | Fix zooming in declarative webbrowser demoJoona Petrell2010-10-291-1/+1
|/ | | | | Task-number: Reviewed-by: Martin Jones
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-296-6/+6
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-261-4/+26
|\
| * Add quit buttons to declarative demosJoona Petrell2010-08-261-4/+26
| | | | | | | | | | Task-number: QTBUG-13048 Reviewed-by: Martin Jones
* | Make declarative examples a bit more qt-like.Yann Bodson2010-08-264-0/+0
|/
* QML focus API updates.Michael Brasser2010-07-211-1/+1
| | | | | | | | | The wantsFocus property has been renamed to activeFocus, to better reflect its value. Reading and writing the focus property is also now consistent -- this property represents focus within a scope. Other small changes were made to keep things consistent with the new naming. Reviewed-by: Aaron Kennedy
* Remove the old WebView element in src/import. The new one is in ↵Alexis Menard2010-06-182-4/+3
| | | | | | | | | src/3rdparty/webkit Also change a bit the demo due to a little API change. The module is not org.webkit but QtWebKit now. Reviewed-by:simon hausmann
* Add go button to webbrowser example.Yann Bodson2010-06-105-4/+36
| | | | Task-number: QTBUG-11310
* Accept enter key in the webbrower demo url input.Martin Jones2010-06-071-0/+4
|
* Fix some bugs in the QML Web Browser buttonsAlan Alpert2010-05-312-1/+2
| | | | Now with fewer warnings! Also, the stop button works.
* Fix zoom bug in QML Web Browser demoAlan Alpert2010-05-312-3/+3
| | | | Zooming out no longer zooms to smaller than the window size.
* Add license headers for .qml files.Jason McDonald2010-05-216-0/+246
| | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me
* Removed dependency of QDeclarativeWebView to private Qt (Declarative) APISimon Hausmann2010-05-131-22/+7
| | | | | Exchanged the use of QDeclarativePaintedItem with the use of QGraphicsWebView and its tiled backing store.
* Flickable small API changes.Yann Bodson2010-05-122-10/+6
| | | | | | | | | | - Split moving into movingHorizontally anf movingVertically - Split flicking into flickingHorizontally and flickingVertically - Rename flickDirection to flickableDirection - onMovementStarted, onMovementEnded, onFlickStarted and onFlickEnded signals removed Task-number: QTBUG-10572 Reviewed-by: Martin Jones
* Expand if available space changes.Warwick Allison2010-05-111-0/+6
| | | | Task-number: QT-3175
* Cleanup and simplify the webbrowser demo.Yann Bodson2010-05-1136-487/+225
|
* CleanupYann Bodson2010-05-061-3/+3
|
* Use enum rather than string for easing type.Yann Bodson2010-05-052-3/+3
|
* Add .qmlproject files for declarative demos.Yann Bodson2010-04-201-0/+16
|
* Don't use zoomfactor.Warwick Allison2010-04-161-2/+2
| | | | | It gives better resolution for text positioning, btu many web sites don't work well with it and WebKit.
* Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-085-5/+5
|
* Deprecate inline Script {} blocksAaron Kennedy2010-03-222-34/+28
| | | | | | | | Inline blocks/includes have been replaced with an import syntax: import "foo.js" as Foo this gives better separation between QML and code. Imported script blocks also have a mandatory qualifier, which leads to better optimization potential.
* Truncate title at right if too long (cannot currently ElideRight and center).Warwick Allison2010-03-111-3/+1
|
* Fix zooming (broke with transformOrigin default change).Warwick Allison2010-03-021-0/+1
| | | | Task-number: QTBUG-5845
* Move WebView to an extension plugin.Warwick Allison2010-03-022-0/+2
| | | | | | | | Using WebView now requires: import org.webkit 1.0 Task-number: QT-2995
* follow syntax changeWarwick Allison2010-03-021-1/+1
|
* Test, demo, and work-around bug QTBUG-8535Warwick Allison2010-02-262-18/+28
|
* Renamed Flickable viewportXXX properties contentXXXMartin Jones2010-02-263-19/+19
| | | | A viewport is the thing you look through, not what you look at.
* Updates all qml examples/demos to use the easing curve value type syntaxLeonardo Sobral Cunha2010-02-233-6/+6
|
* Rename MouseRegion -> MouseAreaMartin Jones2010-02-222-6/+6
|
* Get rid of the matchProperties/properties distinction, as itMichael Brasser2010-02-183-5/+5
| | | | | | | | | | | has proven to be confusing in practice. property/target and properties/targets will be functionally equivilant (the only distinction being singular/plural). In a transition these properties can be used for both 'matching' and explicit animation based on whether a 'to' value is supplied. The documentation, tests, examples and demos have been updated as well.
* Fix initial scaling. QWebPage::setPreferredSize doesn't really work.Warwick Allison2009-12-021-3/+3
|
* Restructure for easier re-use.Warwick Allison2009-12-027-278/+276
|
* Change from scaling/zooming by zoomFactor to instead use painter scaling.Warwick Allison2009-12-021-10/+22
| | | | Uses a fixed zoomFactor of 4 to allow sufficient sub-"pixel" precision.
* If zooming on nothing, zoom 2x rather than doing nothing.Warwick Allison2009-11-251-0/+2
|
* Use console.log, not printWarwick Allison2009-11-231-1/+1
|
* Pass error messages through to WebView users.Warwick Allison2009-11-181-0/+2
|
* Fix URL update in demoWarwick Allison2009-11-181-1/+1
| | | | If you manually typed in a url in the qml webbrowser demo the browser stopped updating the url bar with the current page your are on.
* Partial fix for QTBUGT-5845Warwick Allison2009-11-171-7/+8
|