summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2424c0bd095143a6d307489475705eb16201a223
| | * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | Change-Id: I79e4de3559a437bf009b55ea4a6edfc19bfa541d
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
| |\ \ | | | | | | | | | | | | Change-Id: Id8466d8fb16c894be864a19458a6f721b5453806
| | * | Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-051-0/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: Icc54c25f478a14c8d14e32935d589086b1ec28d7 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | | Remove obsolete code pathsJake Petroules2018-02-121-8/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I0608503fd0db30bf409893cab754b66952210eff Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / / | | | | | | | | | Change-Id: I14570066d41f3b28bb4fadf1a9a2c0c66af88d86
* | | winrt: Launch default program if unviewable content is loadedOliver Wolff2018-02-012-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file type that cannot be shown in a webview, is passed via setUrl, the user should be asked what to do/the default program should be opened. This behavior matches what is done, when an unknown URL scheme is passed. Change-Id: Ia318f14d9dcdeb8f3bbb734b342eb38a02fb3dc4 Reviewed-by: Miguel Costa <miguel.costa@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | Make QtWebView plugin basedChristian Stromme2018-01-2633-227/+727
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the hard build dependency to QtWebEngine, which opens up the possibility for QtWebEngine, or others, to provide their own plugin. Another benefit of having the backends loaded at run-time, is that we can provide an alternative for developers that wants to publish their application in the App Store, where shipping QtWebEngine isn't an option, due to store policies, and where we already have an alternative/experimental backend that can be used. [ChangeLog][WebView] QtWebView will now load its backends at run-time. Task-number: QTBUG-63137 Change-Id: I581940fe4c3b5e6bb41896367d3163ac8bc7b6b9 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-205-7/+107
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1b0ab1fd69048c03f67da20e0c6e079ef07adf8b
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-184-7/+83
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia6e0a844ba13f1fc5c1098bb70b172d8b120efc4
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\ | | | | | | | | | | | | Change-Id: Ib0d374d52da8b818bc21e6120249a559acd79584
| | | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-081-0/+25
| | |/ | | | | | | | | | | | | Change-Id: Ied78144efa93eb970404b5a14111f425c41021d0 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * WKWebView: try to pass URLs with unrecognized schemes down to the OSJake Petroules2018-01-022-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This more closely matches the behavior of the Android implementation, which attempts to launch an Intent to handle URLs with schemes not directly handled by the web view itself. The QtWebEngine implementation similarly passes URLs with unhandled schemes down to QDesktopServices. For the native web view API we'll go directly to the system URL handling APIs instead of through QDesktopServices again in order to match the Android implementation which uses the native API (Intents). Change-Id: Ie2881bf17f3b057cc053c9a4faa8cd81d6f6faca Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * WKWebView: provide better diagnostics on navigation failureJake Petroules2018-01-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of the current page URL, provide the URL that actually had a navigation failure, in the url property of the loadRequest parameter of the loadingChanged signal. This does not hide any information as the current page URL is still available via the WebView's url property. Change-Id: Ie6350722b9b3529131c51d53144af24cf1ac722d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| | * Fix the build with Xcode 9 and unguarded availability errors turned onJake Petroules2017-12-132-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced in e4016a67bbffefed71a407494e249e978d212b3d. Task-number: QTBUG-65075 Change-Id: I5723ba04ce02842c10aaa4b2ae5dd042f8beabf0 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: Iceec7631019aef0ef0ec81ee117870ce8086edd5
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | |\ | | | | | | | | | | | | Change-Id: Ibf92b0d5c6e256754620593ac57a384682ab8590
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I1ae732443c85451365f6694c59ebcafb07f97d7a
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Icf76ff75f3eef14c32ed33b573033b4117025636
| | * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-211-0/+24
| |/| | | | | | |/ | | |/| | | | | Change-Id: Ib960e28dfa3367d17b643d6849b169f1fcede51f
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 16:49:51 +0000