summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtwebviewHEADdevQt Submodule Update Bot6 days1-2/+2
| | | | | Change-Id: Ie498b5efcd6bcf6399ada324f5b56e8379a3c2f8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot7 days1-2/+2
| | | | | Change-Id: I6371c0a434459189f4fd78aa0c6607ea406398d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot9 days1-2/+2
| | | | | Change-Id: I1089975e336704b9fa06c24ad30ebb5bd06dc463 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot13 days1-2/+2
| | | | | Change-Id: I068eb0e86d197a8b3100dc4164a322be454ab4d6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-04-231-2/+2
| | | | | Change-Id: Ic1948c756baac1d71e7a72595a2e563f9856c8f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-04-181-2/+2
| | | | | Change-Id: I02a17dc5ad355cabfe4f39e9e7acd92b970aade7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-04-051-2/+2
| | | | | Change-Id: I43b754b9f3da12945d30f9bebfa533916a237b8e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add a licenseRule.json file for checking of SPDX license identifiersLucie Gérard2024-04-051-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The license test in qtqa reads this file in order to check the validity of the license used. This file reproduce the QUIP-18 [1] rules, with some exceptions. Each entry in the file corresponds to a set of licensing rules. A set of licensing rules can depend on the file ending, registered in "file_pattern_ending". The last entry in the file has no "file_pattern_ending", it sets the rules for the files whose licensing does not depend on their ending. The license to be used depends on the location of the file within the Qt module repository. Let's call this "<true_location>". The "<true_location>" can also correspond to a file name, offering flexibility for exceptions to the rule. The "<true_location>" are registered in "location". For each "<true_location>" there is a "file type" entry and a "spdx" entry. The "spdx" entry gives the rule: the expected license tag(s) in SPDX format for the file ending (if applicable) and "<true_location>". The "file type" informs on the QUIP-18 type the tested file corresponds to. It is purely informational for the reader. The set of rules are tested in order of appearance in the json file. For this reason, a more constraining ending (like "special.txt") needs to appear in a "file_pattern_ending" located before the "file_pattern_ending" of a less constraining ending (like ".txt"). Also, a file ending cannot be present in two "file_pattern_ending". "file_pattern_ending" and "spdx" should list strings. "<true_location>" can be regular expressions. During the test the deeper "<true_location>" are checked first. The order is which they appear in the json file does not matter. To test this file, run QT_MODULE_TO_TEST=../qtwebview perl tests/prebuild/license/tst_licenses.pl [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121039 Change-Id: I286e53b6437921b121030461d579dd8bbd8c8c58 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Correct license for examples filesLucie Gérard2024-04-053-3/+3
| | | | | | | | | | | | According to QUIP-18 [1], all example files should be LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I4ae1e94abe3fd5d9ef0e544ddc9183e018f1723b Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Change license for test filesLucie Gérard2024-04-053-3/+3
| | | | | | | | | | | | According to QUIP-18 [1], all test files should be LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I90dc70a85a6699858ca8f6c6b48bb4e125a22da7 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Use NO_GENERATE_CPP_EXPORTS explicitlyAlexey Edelev2024-03-251-0/+1
| | | | | | | | | | Use NO_GENERATE_CPP_EXPORTS explicitly for modules that don't need the autogenerated exports header file. Task-number: QTBUG-90492 Change-Id: I1edc1c8bd4fa70dd95058fdbde06ee69c71a3a16 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-03-181-2/+2
| | | | | Change-Id: Ia5717adbfbd093c8075470129c02dcc67abde99e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-03-161-2/+2
| | | | | Change-Id: I2f49d420a6d1e3809e948886e1309cec63a760b4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-03-141-2/+2
| | | | | Change-Id: I356a732503b08e5af87e2d66f4661722dcf3e073 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-03-101-2/+2
| | | | | Change-Id: I046b056cddb43252f090659ebfb4bed57316f368 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* windows: Fix freeze when loading Qt Web Engine pluginEskil Abrahamsen Blomfeldt2024-03-043-0/+15
| | | | | | | | | | | | | | | | | | The mechanism which initializes Qt Web Engine via the plugin loader does not work on some graphics drivers on Windows, which do not support initializing graphics in DllMain(). Since Qt Web Engine is always the backend on Windows, this patch makes Qt Web View depend on it directly and calls initialize from QtWebView::initialize() instead on that platform. [ChangeLog][Windows] Fixed a freeze on startup on Windows. As part of the solution for this, the Qt Web View library now depends directly on Qt Web Engine on Windows, instead of indirectly via the plugin library. Fixes: QTBUG-117882 Change-Id: Ia1b3e54145477f645bbb97856bdbbb68b58d2785 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-03-021-2/+2
| | | | | Change-Id: I614c831bad8fb324ed9f88ef4fd23961b63bb85f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-02-281-2/+2
| | | | | Change-Id: Ida86abb7c938e12d23c8535aae039d21eb1f8283 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-02-261-2/+2
| | | | | Change-Id: I582d3de7e010f19530e29bc5c2860cabb65be26f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-02-191-2/+2
| | | | | Change-Id: Iaba22b71ff46fe409745ceb308ba0791d2212646 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-02-111-2/+2
| | | | | Change-Id: I780e164c9038430da51dd9b7873c9aae6e184304 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* WebViewQuick: Fix QML moduleUlf Hermann2024-02-021-3/+4
| | | | | | | | | | | | The module depends on QtQuick because WebView is derived from QQuickItem. It should also forward its version to the QtWebEngine dependency (for consistency; it makes no functional difference) and it should not force pointless plugin loading. Pick-to: 6.7 6.6 6.5 Fixes: QTBUG-112346 Change-Id: I57656e1fa064fbe0b57ae9ea9e204770ff709a59 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Remove CMake autotestJoerg Bornemann2024-01-282-18/+0
| | | | | | | | There's no public header to test. This repo provides a QML component. Task-number: QTBUG-84884 Change-Id: I88c17a8839c431eb2e6bcfaa11b90d7953c2ceb6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-01-271-2/+2
| | | | | Change-Id: If78513671b80a1e9af34c6cd9d765c8861925c6f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-01-231-2/+2
| | | | | Change-Id: I9237106f1d41076ec0508c02f910b56a81440ef5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-01-161-2/+2
| | | | | Change-Id: I986882b3e385199295c9e459dccb5d5ce7a364f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-01-131-2/+2
| | | | | Change-Id: I52c4431067aebd5d8f5446773d15e3d3fafb4bce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-01-111-2/+2
| | | | | Change-Id: I4918a7d307baaa1140195e45e15fa494aa5e8064 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2024-01-061-2/+2
| | | | | Change-Id: I2416df98c0bf055b5c7e2dadfd98372c0de4bc16 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-12-281-2/+2
| | | | | Change-Id: Id41db0d5821c007c6c666f878a51e1338660266d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-12-211-2/+2
| | | | | Change-Id: Ibbe048b581ba6e34a630da6df8c5dca32cad0328 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-12-201-2/+2
| | | | | Change-Id: I110692ec525016ca5bf54b1b06e21e1409113c00 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use canonical Qt6:: target prefix in examplesKai Köhne2023-12-162-6/+6
| | | | | | | Pick-to: 6.7 Task-number: QTBUG-113277 Change-Id: I0169f07d48f4754c11b248f9022a710161d21138 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-12-161-2/+2
| | | | | Change-Id: I982a687adac3d72f78134aa67f61802bafeaf880 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-12-141-2/+2
| | | | | Change-Id: I488e2272e84726fd53f3c715b0037c4d57aa8c0a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.8.0Jani Heikkinen2023-12-141-1/+1
| | | | | Change-Id: I632496fa8aba488d92c87827790d38342c7eccba Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-12-041-2/+2
| | | | | Change-Id: Icaf484e011371bbf6efdd5879977c222539600b6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-12-021-2/+2
| | | | | Change-Id: I1d3ab87d2f61b852ebe41b8f417c91a0e91e7cb2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-12-011-2/+2
| | | | | Change-Id: I3f75a035b29bc93bdee27c179e80f9b71109d828 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-11-301-2/+2
| | | | | Change-Id: I2fddbb7481a3461ec3e3a36daa7e9a26ea271e76 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-11-251-2/+2
| | | | | Change-Id: I652f76fe34d8330e81d1a7d38a3f4f83da5163d5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix typo in WebViewSettings::javaScriptEnabled propertyAndreas Eliasson2023-11-231-1/+1
| | | | | | | Fixes: QTBUG-119356 Pick-to: 6.6 6.5 Change-Id: I934e15d7ef38cb8b01b07de60d10a345b8772024 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-11-221-2/+2
| | | | | Change-Id: I49a646bcb13d7fc48f6f9abd244f1c11883f8ca5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-11-201-2/+2
| | | | | Change-Id: I6089dc1a6fa68e5068c7a64331da4729e91549c3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-11-171-2/+2
| | | | | Change-Id: I42794b2509bfc9cd69ea1c088aee56cbd6293e87 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: use convience wrapper to register nativesVolker Hilsheimer2023-11-161-6/+1
| | | | | Change-Id: Iacea0f1b0376e04a6d43f453f7103e0ee624b43c Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-11-151-2/+2
| | | | | Change-Id: Ie3b37bea7f4e99258989e7425a86f3e2096a866c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebviewQt Submodule Update Bot2023-11-131-2/+2
| | | | | Change-Id: I4069db7aee966ece2d6fae5cacd1b88bfd92de32 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: modernize implementationVolker Hilsheimer2023-11-132-160/+124
| | | | | | | | | | | | | | | | | Declare used types, use modern variadic template APIs, and native method declarations to get rid of all hand-crafted signature strings. In the native methods, cast the id (that was previously created via reinterpret_cast from 'this', pointing to the private) back to the private pointer directly, and only maintain a set of privates to make sure that the id we get is still representing an alive private. Remove some dead (commented) code, and simplify JNI_OnLoad. Change-Id: Ie8711e5f072edde5781b33941aee4e37b8213ea2 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: make functions static if they don't need the objectVolker Hilsheimer2023-11-133-20/+22
| | | | | | | | | | | | | | | This prevents threading issues when calling object functions in a lambda run on the android main thread, when the QJniObject was instantiated on the Qt main thread. As a drive-by, store the id as a 64bit value on the C++ side. jlong is always a 64bit type, even on 32bit Android systems, so we can't use quintptr without truncating data. Change-Id: I96d983eb9b2e99338768d30f7000ec9e75d3fea6 Reviewed-by: Christian Strømme <christian.stromme@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>