summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: Ia8767f3c5c65977175bd5f84442691dddf2b0ab5
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+26
|\ | | | | | | Change-Id: I0d1d6069864f0fea3afecc6d6bd4bc56dfc092b5
| * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-221-0/+26
| | | | | | | | | | | | | | | | | | + bb7b87f584128bfa5325921a60e80e3d03f9e194 iOS: Check if the external browser can open the url first + 5f219dd53bb87da9e07a65177c9bdfb289f7d14e Bump version + 161e4ec3af7d6c952f1a4b3c44ec6722dc1c0a18 Doc: Add info about using Qt WebView on the desktop Change-Id: I18c33f3f891fa1a856d68cd97944116186a532b4 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Make sure that we have a valid plugin before using itChristian Strømme2019-02-261-2/+5
|/ | | | | | | | | | | | The code assumed that loading the plugin would succeed if we could read its meta-data, this is of course not always the case, as a plugin might not have its dependencies met and fail to load, e.g., this is the case if trying to use the QtWebEngine plugin when QtWebEngine isn't installed. Fixes: QTBUG-71380 Change-Id: Ib88281b2b291213891cfbb77b0728c1bdd6dd1fd Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+20
|\ | | | | | | Change-Id: I1d436c457493cfecd507acfa28b8d55519563006
| * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-131-0/+20
| | | | | | | | | | | | | | | | | | | | + 8970865f64bc4f02ad110c0ad1d9bbd8e949a4d9 Bump version + 779bf9c3f24365df3f681a029cafd78c7991e929 Add changes file for Qt 5.11.3 + d53e316480889660e1668ef4b46a122dc333c499 iOS: Keep the navigation object passed into didStart for finishing + 0a68deca4de8eca51024cd7ca4235d274cf984fd Bump version Change-Id: Ib9551583882c123f4d994c8dbbe6cbb4da9de65e Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Doc: Add info about using Qt WebView on the desktopLeena Miettinen2019-01-172-5/+8
| | | | | | | | | | | | Fixes: QTBUG-72977 Change-Id: Ibc274cbcc5f5aa1e71673caff156627bf04b12ea Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | Change-Id: Icdcb6dec441a667ce0556bc7fb5d614c2e3d17af
* | iOS: Check if the external browser can open the url firstAndy Shaw2019-01-081-1/+7
|/ | | | | | | | | | | | | If the external browser cannot open the url (as can be the case with file schemes) then it should fall back to using the same webview instead so that the link is not ignored. [ChangeLog][Platform Specific Changes][iOS] Now opens links with _blank target in the current WebView if the external browser cannot open them. Fixes: QTBUG-63963 Change-Id: Ibd77c82a084d130e034c4d98ba9b08bb5cdf5743 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Bump versionKari Oikarinen2019-01-071-1/+1
| | | | Change-Id: I35b1933ed6ae1195f3bac6454bf09bb737204d2c
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
|\ | | | | | | Change-Id: I5b941c6472124936a8d789c996843425d0d0ba22
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| |\ | | | | | | | | | Change-Id: Ie99aff45cabfb0235ae9f401dbb05065e2171223
| | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-201-0/+20
| |/ | | | | | | | | | | | | | | + e54a993e028039be93a46c5decf00194d898b9c4 Fix URL in minibrowser example + 8970865f64bc4f02ad110c0ad1d9bbd8e949a4d9 Bump version Change-Id: Ibea5928dff447070ef2f66382c2644b81cb494b8 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+18
|\ \ | | | | | | | | | Change-Id: I805a66d7a353154cb60c0b496a6dcc2c05ded64c
| * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0-beta4v5.12.0Antti Kokko2018-11-051-0/+18
| | | | | | | | | | | | | | | Change-Id: I2f5214b513fc61d70f7660ef836bb27ee1d4fe85 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | iOS: Keep the navigation object passed into didStart for finishingAndy Shaw2018-11-292-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of relying on the different frames to fail or finish as this is not reliable in iOS 12 we check if the navigation object passed into didFinish is the last one we got in didStart. At that point we can assume that the page has in fact finished loading. Change-Id: I06c20863b27a384d3532c06a18723ad5d3347363 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: .qmake.conf Change-Id: I351ed200a93610818558baa1ffbf8c80841101be
| * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | Change-Id: I305c66141a8bab625e780001a49d495186adf68b
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3v5.12.0-beta2Qt Forward Merge Bot2018-09-291-1/+1
|\| | | | | | | Change-Id: Ifa2a25c91373b679d3892fff49fab20d2827e031
| * Fix URL in minibrowser exampleChristian Strømme2018-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | Make the URL to qt.io use HTTPS explicitly, as e.g., newer versions of iOS and Android have stricter rules for clear text communication, and on these platforms resource that require clear text communication will not be loaded. Task-number: QTBUG-70281 Change-Id: I8b117e6f8d48f4b52361248f9681584e73980db1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta1v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|\| | | | | | | Change-Id: I616a876e418fdd0130f9cae5f67782593a7a681b
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: I59a12ab7cde2a7e07e87cce1d4cb67d59ea0b0a2
| | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: I52eb20d5fc1748de948e4fbd53c57382f26e5699 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Add missing .gitattributes fileJani Heikkinen2018-08-101-0/+2
| | | | | | | | | | | | | | Task-number: QTBUG-69754 Change-Id: I7fd52e2013a2b2fcbcc8c405ea3ac266f2011027 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie6827eac7371b919ef17410e2888670c3ca66dd4
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I63f602e24e61bc16cae7d739e11e5b6b19b28190
* | Avoid boring git status messages after buildsEdward Welbourne2018-07-061-0/+2
| | | | | | | | | | | | Change-Id: I12d66b6bb6284adf22fceab1166c5a7667970e42 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-232-1/+25
|\| | | | | | | Change-Id: Ie947397c531d594f1774b2fc5a931a3b560e1c4b
| * Merge "Merge remote-tracking branch 'origin/5.11.1' into 5.11" into ↵Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | refs/staging/5.11
| | * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| | |\ | | | | | | | | | | | | Change-Id: Ia8f9a9f94d7cd143dca7f4f8b65c90c47ebc82e1
| | | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-141-0/+24
| | |/ | | | | | | | | | | | | | | | Change-Id: I9fd8676cec1b51ab32896f9148fb4867a87d058f Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * / Doc: Add missing dots (qtwebview)Paul Wicking2018-06-191-1/+1
| |/ | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I396217ea3f2c752c82491de90665ecb24a399ef9 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Fix missing dependency for webenginecoreMichal Klocek2018-06-181-1/+1
| | | | | | | | | | | | | | | | WebEngine plugin has also private dependency to webenginecore. Task-number: QTBUG-68945 Change-Id: I96f317bc4d2ba54c56c0d8a875b6e4045de0d8e1 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-043-0/+57
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3fff6d7e8e1579d099765b9750f848a666ffb644
| * Add changes file for Qt 5.9.6Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | | | Change-Id: I8026f9052964c10efb08e69f414a6e9540d2e9d2 Reviewed-by: Martin Smith <martin.smith@qt.io> (cherry picked from commit acc015e1cad69aa1a5224f6a3dcafa79df3a9286) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-011-0/+25
| | | | | | | | | | | | | | Change-Id: I85bb2dccad8a5d3e68e5f05c5e6f5888c7f0d0db Reviewed-by: Christian Stromme <christian.stromme@qt.io> (cherry picked from commit 810bfc6b6d97f41696113f3e72cdb2f937ff96ae) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: I05859776b78405fc0e5f0bf032fa679ee2cf7b82
| * Doc: Add license details to index pageKai Koehne2018-05-301-0/+8
| | | | | | | | | | Change-Id: I46c58eabfbdda0413d4f7fbe12c1b57dd7c902bf Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+39
|\| | | | | | | Change-Id: I7947ac65a09c0249519f8b6ecea123b5222fa961
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+39
| |\ | | | | | | | | | Change-Id: I367cabe57c4a6af29034455a4770f8efa205f434
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-241-0/+39
| |/ | | | | | | | | Change-Id: Icec0d03fd3e23341d0ec444fa20bcc08a62413ef Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I8507b0b9bf36371bd1e5c004e792bee3177432fd Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-071-0/+4
|\| | | | | | | Change-Id: Ibaa3d27a761add82ecd44b57bfae97898e92372e
| * Darwin: open links with target="_blank" externallyv5.11.0-beta4Jason Erb2018-04-051-0/+4
| | | | | | | | | | | | | | | | | | Without this change, such links do not open at all. Task-number: QTBUG-67293 Change-Id: I15e7944dc75271948c6356ac9f949333039b9671 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-241-12/+27
|\| | | | | | | Change-Id: Id39e269606731b7d8b7e581b43d6c0a2260fe765
| * Darwin: Implement didFailNavigation to handle when an error occursv5.11.0-beta3Andy Shaw2018-03-211-12/+27
| | | | | | | | | | | | | | | | | | | | | | When an error occurs during navigation then didFailNavigation will be called. As didFailProvisionalNavigation is not called in this case then we need to handle it in the same way to ensure the request count is correctly decremented. Change-Id: Ib0bab408c4d8a54a1f1e7e0b1c3832f05cd10f65 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-131-0/+1
|\| | | | | | | Change-Id: Iae116883e1e781f02acbb141079975073d2ee587
| * Fix visibilty changes of the WebView when it's inside a widget sceneChristian Strømme2018-03-121-0/+1
| | | | | | | | | | | | | | | | | | This fixes the issue when the the WebView is inside a QQuick scene in a widget application, and the owning widget is hidden. Task-number: QTBUG-66927 Change-Id: I7efdc2ff5c7f0361be7cd10eb33b7307d5f50d95 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-273-9/+32
|\| | | | | | | Change-Id: Ibea2bf269307be9a5a8b49c865d6698a18b327a2
| * Remove AppKit dependency from iOSv5.11.0-beta2v5.11.0-beta1Jason Erb2018-02-231-1/+2
| | | | | | | | | | | | Task-number: QTBUG-66552 Change-Id: Ic5f4947a6da425e229e66b293f0c156b1049ef3f Reviewed-by: Christian Stromme <christian.stromme@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 20:16:19 +0000