| Commit message (Collapse) | Author | Age | Files | Lines |
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
Qt 6.5.7-lts release
Conflicts solved:
dependencies.yaml
Change-Id: Ia65320c501127935e4d739b7e4ae739a166caff0
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
To not have to write NSArray and NSDictionary conversion from scratch
we round-trip via JSON. One quirk of this approach is that NSDate is
supported as a standalone result object, but not nested in an array
or dictionary, as NSJSONSerialization doesn't support that. But at
least this brings us some of the way for array and dictionary support.
Fixes: QTBUG-70166
Change-Id: Ied8a261e964c5adbadb503efb0bb7812ef911b83
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit b1e326ddffc45dd12dd6e454254649686bfdbfa4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 3c3f5813166a04f347f7083fe6a78251db85caac)
(cherry picked from commit 4c1303a51cd1bcfbb3c89d62725d1d60e8b2564e)
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| | |
Qt 6.5.5-lts release
Conflicts solved:
dependencies.yaml
Change-Id: Id6f11a58e5584e31f0959a77b3417ec05120b1b0
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
Fixes: QTBUG-112346
Change-Id: I57656e1fa064fbe0b57ae9ea9e204770ff709a59
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit b0efb7b30efcfec857964c65a3930b619422e41e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit eb3e2e578995c793cb46fa63a82b683adfb1c8a5)
(cherry picked from commit a773b38f872b7201ad024d4fb032bfc6334c75e8)
|
| |/
|
|
|
|
|
|
|
|
| |
This reverts commit ef22fc4eb05925d6b88a409cc9f04aed43a8211a.
Revert of commercial SPDX license identifiers is required for the
Qt 6.5.x opensource releases, Qt 6.5.4 onwards.
Change-Id: I9c990d96adf02f1d50b95354223500d384d5d471
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
|
| |
|
|
|
|
|
|
|
| |
Fixes: QTBUG-119356
Change-Id: I934e15d7ef38cb8b01b07de60d10a345b8772024
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit bb601f70259eae6fb511e6a8be0798a01184cf82)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit bb6148f5fa53ac47ab07fb875e7a6106dc05c98b)
|
| |
|
|
|
|
|
|
|
|
|
| |
The build files should not include a commercial SPDX-License-Identifier.
Instead, a BSD-3-Clause license identifier is used.
This change is related to ef22fc4eb05925d6b88a409cc9f04aed43a8211a which updated the licenses in the build files even if it shouldn't.
Task-number: QTQAINFRA-5900
Change-Id: I8d752c3555a7022f43c69764b239a6cc33a158b6
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
Updated the commercial SPDX-License-Identifier to
the files in tqtc-qtwebview. Examples, tests, or
documentation files are not updated.
Task-number: QTQAINFRA-5900
Change-Id: I9ca04e12aa99d099b826dda3b189ab4bbaae90bc
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
We cannot handle events on behalf the native web view.
Fixes: QTBUG-69801
Change-Id: I919ae0fcbf0d11ebb1580ee6108fa71abd8c1747
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit b4bc5c1c449ccfd78b0ef2bf2868da22ae63a040)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit feb6f075d86deabf163a95caa1d14873369ab93a)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
find_library(FWWebKit WebKit) stores the absolute path to the
framework of one of the sysroots, into FWWebKit.
When building with CMake 3.27 targeting multi-arch iOS, this results
in the following flag being passed to the compiler, regardless of
the architecture/sysroot:
-F/Applications/Xcode14.app/Contents/Developer/Platforms/
iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk/
System/Library/Frameworks
This causes warnings when building qdarwinwebview.mm regarding
unsupported webkit features during the x86_64 simulator build. When
combined with -Werror, it fails the build.
Use qt_internal_find_apple_system_framework() instead of
find_library(), to ensure we pass '-framework WebKit' instead of the
absolute path to the framework. This avoids warnings and is
cross-sysroot compatible.
As a drive-by, also fix the lookup of the Foundation framework. It's
called Foundation, not FoundationKit.
Pick-to: 6.2
Task-number: QTBUG-118138
Change-Id: I4379f14d65a37470f08ae8e7f46e00b886eadaf1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 7b29c1fe6fea9ee1a13082ba72483db76ce35719)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9add1a05881e131ecc30d364c9678d72b481cd43)
|
| |
|
|
|
|
|
|
|
| |
Task-number: QTBUG-117224
Change-Id: I0b5542005e58eb8b7956b33eedf169284208eb07
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
(cherry picked from commit 7481fc8e67d7ed7593cf08aecd64e59e6b504c29)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 8e963c5af06cc138afbf514235c2811e6e7b622c)
|
| |
|
|
|
|
|
|
|
|
| |
Use isEqualToString to actually check the content of the NS strings.
Task-number: QTBUG-114495
Change-Id: Iadffee7e9b47286f347731639f094ae5cb748926
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 4dc8b217ae5da96bf306d22640b52301494f5ca8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
| |
Use KVO the same way we do for the progress
Task-number: QTBUG-114495
Change-Id: I8fd9f6adaa1fba052d25e1480836dca61558351c
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit b8573d62477b2920b68f84d478a3870e8daeba30)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
| |
QT_MAC_WANTS_LAYER is on by default on macOS now.
Change-Id: I1788e01056a572aaa73293a596dad4068f3f3bfd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 5f15afaaf07586006b1731cadcb061fa23c71aef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QtAndroidWebViewController constructor blocks a qGuiThread until
the WebView is created and configured in UI thread. Such an
implementation can easily lead to the deadlock (For example in the case
of handling InputConnection - it is exactly the opposite. UI thread is
blocked and waits for handling event by qGuiThread). That's why we need
to lock AndroidDeadlockProtector before blocking qGuiThread.
This implementation resolves potential deadlock using
AndroidDeadlockProtector. If protector cannot by locked, qGuiThread will
handle events to make it possible.
Fixes: QTBUG-82810
Change-Id: I71aaea9ceb7c41b818ed533ce41c70b5c0e8d7de
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 26c2569b73d884e3130705c77b8f2920f5645029)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
| |
Use the correct plugins directory when generating
dependenciencies. Install android jars to INSTALL_DATADIR.
Task-number: QTBUG-106533
Change-Id: Ifc74a554236d798945dfb21ea65a775e9d752015
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit ef204f20c52ca2c8c8f61cecb6c435bf39592a89)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
| |
This was missed when the API was added in be675d3721ff2eba
Change-Id: I8c5eeb2233316b6ad850c2f285495c675e18f1d8
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
|
| |
|
|
|
|
|
| |
The warnings became fatal.
Change-Id: If58580c5554115e55656f5d97a44b48a926d724a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Adds API and implementation for changing the settings of the WebView.
[ChangeLog][General] Added settings API to make it possible to
modify some of the WebView's built-in functionality.
Task-number: QTBUG-97487
Task-number: QTBUG-98549
Change-Id: Ia121175ec08c96f56fd2148b02dccbc963fff244
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Using the WebView with QQuickWidget is not really a use-case the
WebView is well suited for, due to the native WebView being an overlay,
however it should not crash or trigger an assert, so this change tries
to avoid some of the caveats when mixing with QQuickWidget. For example,
we cannot under any circumstances call winId() before the window the
QQuickWidget lives under, is backed by a platform window. The native
WebView is therefore not added before the platform window is created.
Pick-to: 6.4 6.2 5.15
Fixes: QTBUG-46084
Change-Id: I815d37cdd0328b3a258ef60294b5ea282f41cfc6
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.
Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.
Task-number: QTBUG-99313
Change-Id: Ib5e494e50a24a7e9af542cc362b15ca1f167106d
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-105718
Change-Id: I824b873d98c922af8a4a290dcd797a2135d1147f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
| |
|
|
|
|
|
|
| |
qdoc's new clang backend does not use them anymore.
Task-number: QTBUG-104903
Change-Id: I7f3624122a7c4b5e07fadfdc507267cd02fca68f
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
|
|
|
|
| |
Task-number: QTBUG-103196
Change-Id: Ia5a157ae38995081b939a2b49083bf59d526b69a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
CMakeLists.txt and .cmake files of significant size
(more than 2 lines according to our check in tst_license.pl)
now have the copyright and license header.
Existing copyright statements remain intact
Task-number: QTBUG-88621
Change-Id: Iff8b50e402d070ba5fa2562fef50b7d7d3743cb4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
| |
|
|
|
|
| |
Pick-to: 6.4 6.3
Change-Id: I1832215bb1c0904aa21b511db79803f2d6570324
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.
Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: I0f719de9e6e1fd4a7c50a247831e5a768e08df14
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
QQuickItem is referenced as prototype but there is no
dependency declared to QtQuick where it is defined.
Pick-to: 6.3 6.2
Change-Id: I5cbf13290d6a1a026c0fe3bb085d39474964d700
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
The cookie API that was added in 317e13cb2d97 missed the registration
and implementation for the native java functions needed for notifying
when a cookie got added/removed.
Fixes: QTBUG-102801
Pick-to: 6.3
Change-Id: I7594f75abba17b6ff1843d5349af085f90aae9b1
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
Use global CMake and qmake snippets and reorganize some of the sections
structure. Also, make minor grammar and syntax changes.
Task-number: QTBUG-100369
Pick-to: 6.3 6.3.0
Change-Id: Icd8b9555aac957ec60c475fe46f5aebbfe513004
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
Enable local storage by default, same as QtWebEngine and iOS.
Fixes: QTBUG-75723
Pick-to: 6.3 6.2 5.15
Change-Id: I42f04e53b5014ef107dec61535f8c102f2d5dd27
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Tero Alamäki <tero.alamaki@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
See script in qtbase/util/includeprivate for the rules.
Since these files are being touched anyway, I also ran the
updatecopyright.pl script too.
Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Remove usages of outdated LGPL3 header that references
LICENSES.LGPLv3 instead of LICENSES.LGPL3. Use BSD instead in the
examples, updated LGPL otherwise.
Also remove the now unreferenced LICENSE.LGPLv3, LICENSE.GPLv2
files, and instead the newly referenced files instead.
Pick-to: 6.2 6.3
Change-Id: I01e1325ee2c7a147e095c08b370b88ded9a8daff
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
Including the header causes issues when building Qt with Conan which
installs each repo into its own install directory.
The issue likely doesn't surface with a regular all-in-one install,
because the header is found via some indirect means.
Pick-to: 6.2 6.3
Change-Id: I5640c1cb9aa34207d619362000c135d8e4e5d1ac
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
|
| |
|
|
|
|
|
| |
Fixes: QTBUG-99372
Task-number: QTBUG-86533
Change-Id: I24b3d6a02374972536bac6bb6fc6af6167cc8c6d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| |
|
|
|
|
|
|
|
| |
Setting and deleting cookies, changes for android, darwin and webengine plugins
Pick-to: 6.3
Task-number: QTBUG-96204
Change-Id: I4f79d34384e490b70a1e9f89196dd113733d5fe1
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
|
| |
|
|
|
|
|
|
|
| |
Prevent calling signals on derived class on destruction form
base class. This is not safe and we guard for that now in qtcore.
Pick-to: 6.2
Change-Id: I7147023ac2f5a3542403d3aa549588b22db58da5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
This removes the string values for the common keys, in favor of
QtPluginMetaDataKeys.
It also fixes a bug in comparing an iterator from metaDataObject to
pluginMetaData's end.
Change-Id: I3eb1bd30e0124f89a052fffd16a6f2d82ad568af
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| |
|
|
|
|
|
|
| |
Amends ecc5e01135c
Pick-to: 6.2
Change-Id: I0e35c72b26e15b141b4efe7057eadd22a96289a8
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
| |
|
|
|
|
|
| |
Qt uses "Almost Never Auto"
Change-Id: I42eb903a916645db9900fffd16a57ae4eab59515
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
* Comment out \instantiates link to a private class as we cannot link
to it.
* Move \qtcmakepackage to the correct place under \module.
* Add missing documentation dependencies.
Pick-to: 6.2 6.2.0
Fixes: QTBUG-96294
Change-Id: Ib114b6891e050559914049fd944397d34a70f5fa
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
- Added "Using The Module" section that documents how to include the
module in CMake.
- Removed version numbers from documentation.
- Added CMake import section in the QtWebView namespace documentation.
- Removed references to UWP.
Pick-to: 6.2 6.2.0
Fixes: QTBUG-94935
Change-Id: If5c1f63179506b03653fcbbcbb3bdce5951cce3a
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
| |
|
|
|
|
| |
Task-number: QTBUG-95987
Change-Id: Idc54d8b51fb77ca3cf9a2179bad594b41754c657
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These warnings were fixed:
qt5/qtwebview/src/webview/doc/qtwebview.qdocconf:33: (qdoc) warning: Cannot find file or directory: ../../imports
qt5/qtwebview/src/webview/doc/qtwebview.qdocconf:34: (qdoc) warning: Cannot find file or directory: ../../imports
qt5/qtwebview/src/webview/doc/src/qtwebview-module.qdoc:28: (qdoc) warning: Can't link to 'WebView'
qt5/qtwebview/src/webview/doc/src/qtwebview-overview.qdoc:29: (qdoc) warning: Can't link to 'Qt for UWP'
qt5/qtwebview/src/webview/doc/src/qtwebview-overview.qdoc:29: (qdoc) warning: Can't link to 'WebView'
Task-number: QTBUG-95860
Pick-to: 6.2
Change-Id: I86df9f911d75e936d7c38f4c1accfe0b8c96eb9d
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
|
|
|
|
|
| |
Pick-to: 6.2
Fixes: QTBUG-94934
Change-Id: I41561751ae716706aa7492249c5123138e94c44d
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-95170
Pick-to: 6.2
Change-Id: Id3a2ece3a3d2fa2eadb78fa5dc558466654c42a6
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
| |
|
|
|
|
|
|
|
| |
Add a basic changes page for consistency with other modules.
Task-number: QTBUG-94934
Pick-to: 6.2
Change-Id: If3f8d2815b0d88a3c8e715b8e8c69b5d4e8bffa7
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
Move quick sources to sepatrate qml module so new
qml registration system can be used. This drops
dependency of QWebView module on Quick.
Pick-to: 6.2
Change-Id: I10adb5e898ae2ffe4a46f37d759983047ea89483
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
| |
|
|
|
|
|
| |
Pick-to: 6.2
Change-Id: I4cd3c9384014d698f160fe57d81c7d9d8aa83a4c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
| |
|
|
|
|
|
|
|
| |
Depend on CorePrivate
Pick-to: 6.2
Change-Id: I078fee4b95907a8ad17d918244b56a6969a4dd0e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|