summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use printf style qDebug5.6Kai Koehne2017-10-103-6/+5
| | | | | | | | | | | This generates more compact code. It also fixes a build issue with some disabled features on macOS. Task-number: QTBUG-63440 Change-Id: Ice800bdfef09dd83310d40cadd37c15c846ca3e1 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io> (cherry picked from commit 3bcd4c3506c9352874f1403aba22e36108a867a2)
* Bump versionOswald Buddenhagen2017-09-211-1/+1
| | | | Change-Id: I60ba68761ccae58e261f9e5f54de55e185fa7b4f
* Add changes file for Qt 5.6.3v5.6.3Antti Kokko2017-09-061-0/+31
| | | | | | | Task-number: QTBUG-62711 Change-Id: Ice9079dc3dae0ff1692a39d36fe89729093114c2 Reviewed-by: Christian Stromme <christian.stromme@qt.io> (cherry picked from commit 01ff5c0d5f937577cfd2391a43af4180f2a484bb)
* Bump versionOswald Buddenhagen2016-11-281-1/+1
| | | | Change-Id: I6bb4e966b44b230c63ec73da2d0e6f581a1e4ad4
* remove dependencies from sync.profileOswald Buddenhagen2016-11-061-12/+0
| | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: Ibb84dc3a77982a0728586fb52ee48b60c9a6f13e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* qquickwebviewcontroller: don't remove listener from wrong parentRichard Moe Gustavsen2016-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | QQuickViewChangeListener::itemParentChanged is called for parent changes done to any of the items we listen to up the parent chain. But as it stood, we would always remove the change listener from m_item->parentItem(), even if the changed item was higher up in the hierarchy. We would therefore wrongly miss any later changes done to m_item->parentItem(). A bug from this could be seen when pushing an item containing a webview to a stackview, since then, several parent changes would occur. [ChangeLog][General] Fixed missing geometry update bug when a webview changed anchestor (e.g. when pushing it onto a StackView). Task-number: QTBUG-54128 Change-Id: Iff00a0029dd713306db7e39db8c92672a6b379c7 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-161-0/+43
|\ | | | | | | Change-Id: Id6c253d3b582f5ce9e9b1de7056625d2f088cb20
| * Add changes file for 5.6.2v5.6.2Antti Kokko2016-09-131-0/+43
| | | | | | | | | | | | Change-Id: Idb8957de222b6f56e010e1893ea2ea3bc80120ef Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Fix initialization of the WebView itemChristian Strømme2016-09-082-77/+58
|/ | | | | | | | | | Don't delay initialization until we're inserted into the scene, as this will cause every property change/function call that happens before that to be dropped. Task-number: QTBUG-53839 Change-Id: I1a2f9066c7b172e14095d7513f343e34812f7d1a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Fix QQuickViewChangeListenerJ-P Nurmi2016-08-231-4/+4
| | | | | | | | | | | QQuickViewChangeListener wasn't cleaning up its ancestor listeners properly. QQuickItemChangeListener::itemChildRemoved() is too late for removing listeners of the _ancestors_ of the child that just got removed. Task-number: QTBUG-55127 Change-Id: I004a5dd0b49fa36baabf951ee41d8a9ccdef4da8 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Make sure JNI_OnLoad is not called more than onceBogDan Vatra2016-07-201-0/+5
| | | | | | | | | | | | | Since Android 5.0 Google introduce a nasty bug[1] which calls JNI_OnLoad more than once. Basically every time when a library is loaded JNI_OnLoad is called if found, but it calls *again* JNI_OnLoad of its .so dependencies! [1] Workaround https://code.google.com/p/android/issues/detail?id=215069 Change-Id: I87b50b67d7c63a32b3fae067a78780a17b058acb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-173-3/+3
| | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I0b7743edc32d1b3df1c64d09dec9b7c342087a13 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* winrt: Take device pixel ratio into accountMaurice Kalinowski2016-06-101-2/+3
| | | | | | | | | | When resizing, the device pixel ratio needs to be taken into account. Otherwise the area for Xaml viewer will be misplaced and/or wrongly scaled. Change-Id: Id2dd34c2dd29f5582a9f3536e6394c7e49eddf94 Task-number: QTBUG-53405 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-091-0/+30
|\ | | | | | | Change-Id: I635000ca7bd4441cbdd4b6440eecdbb853a7b321
| * Add changelog for 5.6.1v5.6.1-1v5.6.1Christian Strømme2016-05-241-0/+30
| | | | | | | | | | Change-Id: Id905cf856ef026dd5270235eededaa65e6d31b66 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Android: add support for various url schemes.Vincas Dargis2016-06-031-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android WebView does not handle schemes by default, such as mailto:, geo:, and others, but will instead show an "ERR_UNKNOWN_URL_SCHEME" error. This patch fixes it by starting ACTION_VIEW Intent for specified scheme, meanwhile showing the same "ERR_UNKNOWN_URL_SCHEME" error page for invalid cases as before. [ChangeLog][Android] Added support for various url schemes. Taks-number: QTBUG-53736 Change-Id: Ib569ec1598f76f823b2293446ea4e513764ef1fa Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Doc: Copy info about initializing WebView to type overviewLeena Miettinen2016-05-262-1/+5
| | | | | | | | | | | | | | | | Enable automatic linking to Qt GUI module. Task-number: QTBUG-53560 Change-Id: Id22a4a42c038dcbda939b170f9f7c0ae93d6b18b Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Bump versionOswald Buddenhagen2016-05-191-1/+1
|/ | | | Change-Id: I2bbccf7b48e185daea26f942a0b79297f2fbafbc
* Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-1/+1
| | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Ie631ed16dc0e7b3f30940a0f2c0749a90a51c027 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* winrt: Cleanup capability specificationMaurice Kalinowski2016-04-211-2/+0
| | | | | | | | This is added by default with 34e0e908c896126138a95abdeba7456499d0fb68 in qtbase. Change-Id: I3e24dce46604b3bc52e1688731cfcb091df5f8d1 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Fix geometry updates in the view controller.Christian Strømme2016-04-154-31/+38
| | | | | | | | Move the common, and QtQuick specific code, into the view controller to make the behavior more consistent across all platforms. Change-Id: I89cc383fb92ee6755e8fba9baf48e3e756d04cca Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Android: Don't call setClipBounds on the WebViewChristian Strømme2016-04-151-44/+1
| | | | | | | | | | | | When High DPI mode is enabled, with a scale different then 1, the values we get are not in the same scale as setClipBounds expects. While it is possible to convert the values to native pixel first, it's probably better if we just disable this functionality on Android, that is, until a better cross-platform solution can be found. Task-number: QTBUG-51198 Change-Id: Ia3e3e3911b9ba24d83e49afa6bec61696b93073a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-173-2/+42
|\ | | | | | | Change-Id: I7abf6d60ff1738d669f6761b20af380cbf2b4140
| * Bump qml import version.v5.6.0Christian Strømme2016-02-262-2/+3
| | | | | | | | | | Change-Id: Iad7e39cf5a986909bc0e5dcb9a82143b2e9ed260 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Add changelog for 5.6.0Christian Strømme2016-02-251-0/+39
| | | | | | | | | | Change-Id: Ibd5a8021b7ef2b0f12266895d7b77fa2ff5b98f4 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | don't over-expose private dependenciesOswald Buddenhagen2016-03-102-6/+7
| | | | | | | | | | Change-Id: I595eac8877100f35289d42f875ffc6e506774b4f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | remove redundant load(qt_build_config)Oswald Buddenhagen2016-03-101-2/+0
| | | | | | | | | | | | | | .qmake.conf already does that. Change-Id: I88dd34c05f6326f733d23a0a66bdea5853d5beb1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | iOS: Add custom plist which disables ATS for the minibrowser.Christian Strømme2016-03-042-0/+43
| | | | | | | | | | | | | | | | Disabling App Transport Security is necessary if we want to load non-https urls, e.g., qt.io. Change-Id: Ib4ed55c2787968946f35700f521f8a81e96d1443 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Add a proper backend for WebEngineChristian Strømme2016-03-049-71/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for the awkward type re-registering and renaming that was done in the Qml plugin, to support QtWebEngine. Among other issues, the main motivation for this change is to unify the implementations, and make it possible to run the auto tests that interfaces directly with the QQuickWebView class. Having an actual backend for Qt WebEngine means we can get rid of the, non-functional, default implementation as well. Change-Id: Ia93611ed2755c92207ca86ba3890ac4c2c4d72e9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Make it possible to put a WebView inside a QQuickWidget on iOSChristian Strømme2016-03-031-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | When setting the parent view of the WebvView we need to use the real window, and not the off-screen window provided by QQuickWidget. This change also improves the logic for setting the geometry, as extra care is needed to make sure the view is position correctly inside the scene when using a QQuickWidget. Task-number: QTBUG-48221 Change-Id: I476cac926df6c862cc3602b21e97003cc254726c Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | Fix progress in minibrowser example.Christian Strømme2016-03-021-1/+1
| | | | | | | | | | | | | | | | The progress can never be more then 100, so the condition would always be false. Change-Id: Ia75ddd5298d8e0afcc1314d670a656071143c321 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Removing warning about missing override.Christian Strømme2016-03-021-1/+1
| | | | | | | | | | | | | | Caught by -Winconsistent-missing-override Change-Id: I96203ea1bd0c9396bc361e0df4e507d1f12f02f4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Doc: Add note about qrc support.Christian Strømme2016-03-021-0/+4
| | | | | | | | | | | | | | | | | | Loading content through the Qt Resource System is not supported by us or the different backends, so we should document it as a limitation. Task-number: QTBUG-49698 Change-Id: Ibe237987682894957cb34778389fc4ffb3facdb2 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | winrt: Emit the titleChanged() signal when appropriateAndy Shaw2016-02-181-0/+1
| | | | | | | | | | Change-Id: Iafc4f49a0e7a5aee6aef0622142271000b8f82e8 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | Fix warning in release modeMaurice Kalinowski2016-02-181-0/+1
| | | | | | | | | | Change-Id: Iab424566018aaeac1f26d3802f79c1d7b83bad06 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Bump versionOswald Buddenhagen2016-02-081-1/+1
|/ | | | Change-Id: Ia9859403986c3aeb30de0dd3df00f6b4b119ff26
* Add missing begin/end namepace macrosv5.6.0-rc1Christian Strømme2016-01-202-0/+6
| | | | | Change-Id: Ia656aacc021fc063a1ed87acc02cccba1cc9edf7 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-070-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I82ed55a0ffb844ce8f467963dca883f3d3ef2337
| * Bump versionv5.5.15.5Christian Strømme2015-08-181-1/+1
| | | | | | | | | | Change-Id: I144a2fc92fe6fc795529bf2ecb8aad741b4387e3 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Doc: Bump QML module import version no.Venugopal Shivashankar2015-12-291-2/+2
| | | | | | | | | | Change-Id: Ia692190470423d8db82fd6c27f4c9ad06223c438 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Android: Explicitly tear-down the Native WebView.v5.6.0-beta1Christian Strømme2015-12-092-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The WebView will continue to evaluate JavaScript even after we've released all handles to the WebView, to avoid this we'll call destroy() when we release the WebView on our side. On Android 6.0 there's issued a warning when destroy is called, but this is not fatal and seems to be a know issue on their side. Alternatively, if it turns out that calling destroy() causes problems in the future, it's possible to stop JS evaluation by disabling it through the WebSettings interface. Task-number: QTBUG-49664 Change-Id: Ic98d24d58525397ad06ecbc4476cd5613b6663ab Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Android: Fix WebView access to geolocation data.Vincas Dargis2015-12-042-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Webapps dependent on geolocation fails even if ACCESS_FINE_LOCATION permission is set by developer for the package itself. This fix implements implicit user prompt to allow access to geolocation data if ACCESS_FINE_LOCATION permission is set. From now on, QtWebView adds ACCESS_FINE_LOCATION by default to make it work out of the box. Packages built without ACCESS_FINE_LOCATION (if developer removes it manally) will not (naturally) get access to device location as before this fix, nor there will be Android security exceptions. Task-number: QTBUG-49566 Change-Id: I476aef28e59f238a571ed77984b9cd294a9bbd25 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Doc: Highlight Qt WebView's suitability for mobile platformsTopi Reinio2015-12-011-4/+6
| | | | | | | | | | Change-Id: Idf832c54278c27f1658913fa1956fcb5fdbe39dc Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Remove deployment.pri from the minibrowser exampleChristian Strømme2015-11-242-32/+3
| | | | | | | | | | | | | | | | | | | | | | The minibrowser example was created using the Qt Creator templates, which includes hard-coded install paths defined in deployment.pri. For user applications that might make sense, but it doesn't for Qt examples, instead we should install it into Qt's example directory. Task-number: QTBUG-49431 Change-Id: Ia4c33574547a17a186125f10b3eaa14512f81dc8 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Fix compiler warningMaurice Kalinowski2015-11-241-1/+1
| | | | | | | | | | | | | | Was wrongly identified as closing comment by MSVC2015. Change-Id: If2b89c9ace7b8a950852765e55a73fd154f945a9 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | declare dependencies properlyOswald Buddenhagen2015-11-122-1/+3
| | | | | | | | | | | | | | | | | | don't try to build the example when the library is missing. also, don't try to build the whole module if it will be entirely empty. Change-Id: I4de9b6c2454bbfea60dc6b747cd995cfab6c7617 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | be a tad more selective what is declared in EXAMPLE_FILESOswald Buddenhagen2015-11-122-1/+2
| | | | | | | | | | | | | | | | the automation covers everything else. Change-Id: I43ceca984d44779bd950a362d237d535ddb53c00 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Don't show progress indicators on Windows runtime.Samuel Nevala2015-11-091-2/+6
| | | | | | | | | | | | | | Windows Runtime webview reports only indeterminate loading pregress. Change-Id: Ia007e462f68671039ea4708784bbebe9f1142679 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* | winrt: Fix geometry for QWebView.Samuel Nevala2015-11-041-8/+16
| | | | | | | | | | | | | | | | | | Respect statusbar size when setting webviews geometry. Change-Id: Ifae03d2a673930a97ce1726cb50dd19ef6a1f7bb Task-Id: QTBUG-48842 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | Doc: Fix multiple documentation issuesTopi Reinio2015-10-283-26/+51
| | | | | | | | | | | | | | | | | | | | | | | | - Document WebView.loadingChanged() signal - Use QT_VERSION everywhere in .qdocconf - Fix QDoc warnings, linking issues - Mark read-only QML properties as \readonly - Minor language edits Change-Id: Ieb9625d81aaee73a236222b85a496ee5783b644e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>