summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Replace accessibility private API usage with QQmlPropertyv5.11.0-beta1Alexandru Croitor2018-02-221-8/+10
| | | | | | | | | | | | Previously enabling accessibility for the QtQuick WebEngineView was done by calling QuickAccessibleAttached::qmlAttachedProperties() which is a private API call. Instead of that, set the Accessibility attached properties by using QQmlProperty. Task-number: QTBUG-63098 Change-Id: Ibc927c1fce121dee56d8a21af412056d98c82c4d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Expose actual URL for data URLs instead of the virtual URL in the APIPeter Varga2018-02-211-1/+30
| | | | | | | | | | | Chromium considers the actual URL as "scary" therefore prefers to pass a simpler URL via the WebContents::GetVisibleURL() content API function. For data URLs, use the actual URL instead to keep their anchor information. Task-number: QTBUG-64972 Change-Id: I74db3e5dd22a728656a58e50a4e3fba93b82dae2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fixup merge of downloadType from 5.10.1Allan Sandfeld Jensen2018-02-2110-21/+73
| | | | | | | | | | | | | In 5.11 we deprecated downloadType and at the same time ripped out most of the faulty logic. Later we partially fixed the logic in 5.10.1, but kept the 5.11 version during the merge. This restores the improved logic from 5.10.1, while keeping the property deprecated since it is still misleading at times. Change-Id: I12ee09a2b212506f7ba1a336c9c2e88aa3b1de24 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix embedded-linux -no-opengl buildAllan Sandfeld Jensen2018-02-211-1/+5
| | | | | | Change-Id: Iad7f3f21918fc8727a6fac3733cb6e35f4e1c4b0 Reviewed-by: Karim Pinter <karim.pinter@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Separate argv for QCoreApplication and Chromium in WebEngineProcessKai Koehne2018-02-211-3/+25
| | | | | | | | | | | | | | | | On Linux, Chromium manipulates argv, merging all command line arguments into argv[0] and deleting the other arguments - see set_process_title_linux.cc for the glory details. This potentially confuses QCoreApplication::applicationDirPath(), which assumes that argv[0] contains the binary path. This in turn caused a regression in Qt 5.9.4 where resource files could not be located anymore for QtWebEngineProcess. Avoid this by making two distinct copies of argv already in main(). Task-number: QTBUG-66346 Change-Id: I24d103bb15e77db69faae3bcfc736df25e4ec5d3 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add documentation about using Qt Quick Compiler with qrc .js filesAlexandru Croitor2018-02-202-0/+18
| | | | | | | | | | Application developer need to make sure that they skip processing .js files by the Qt Quick Compiler, if the files will be loaded inside HTML pages. Task-number: QTBUG-66155 Change-Id: I09a3c6fa1f31b60a09d30012c6e15ae872bac639 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-181-0/+4
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I230e21638604fe75b6f1d6b7877f9bc4b2d2c020
| * Fix crash on accessing WebEngineView properties too earlyPeter Varga2018-02-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | WebContentsAdapter is not created together with the QQuickWebEngineView. Thus querying a view property can lead to a crash if it uses the adapter. This fix adds the missing guards for contentSize and scrollPosition as it is done for similar WebEngineView properties. Task-number: QTBUG-65942 Change-Id: I9c2668a059b08325629f5730608280ba7f3669cf Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Clear HTTP cache before disabling itSzabolcs David2018-02-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | It is a workaround to satisfy this online cache test: http://refreshyourcache.com/en/cache-test/ This way Chromium provides "cache-control: no-cache" headers and indicates the disabled state of our cache backend. Task-number: QTBUG-63606 Change-Id: I0fdaf0b8dcaa98891b3d0380f4deeaa28a8aba4b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Allow disabling cache of off-the-record profilesAllan Sandfeld Jensen2018-02-153-6/+11
| | | | | | | | | | Change-Id: Ib319f46465e9f330ef5f2c7a5b2f6a3d50c33c00 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Fix linux-clang buildsv5.11.0-alpha1Allan Sandfeld Jensen2018-02-141-1/+2
| | | | | | | | | | | | | | A gn linked with lld doesn't work at all. Change-Id: I488acb65b482cc1348ecd4909b20897e5edb8ef7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix AssertBrowserContextWasntDestroyed DCHECKJüri Valdmann2018-02-131-0/+14
| | | | | | | | | | | | | | | | Triggered sometimes in tst_qwebenginedownloads if the memory allocator reuses memory for a BrowserContextQt. Change-Id: Idb2db94cf0a8419dc45c25620708f3f3da8f9ec8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix javascriptCanPaste NOTIFY signalJüri Valdmann2018-02-131-1/+1
| | | | | | | | | | Change-Id: Ic3f1e11f42f26e7800524dd88f707200ef3b7705 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add support for registerProtocolHandlerJüri Valdmann2018-02-1322-0/+586
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend initialization of URLRequestContextGetterQt to create a content::ProtocolHandlerRegistry for each content::BrowserContext and add the registry's URL request interceptor to the front of the interceptor chain. Implement methods in WebContentsDelegateQt to add/remove protocol handlers to/from the ProtocolHandlerRegistry. Add permission request signal and classes for core, quick and widgets. Add widgets autotest. Add signal handlers to quicknanobrowser and simplebrowser. Task-number: QTBUG-62783 Change-Id: I808e7eb9a1cb4d7216686deed4895de14fe46310 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Register metatype of QWebEngineQuotaPermissionRequestJüri Valdmann2018-02-132-4/+13
| | | | | | | | | | | | | | | | | | | | Declare and register metatype for QWebEngineQuotaPermissionRequest. Enables the quotaPermissionRequested signal to be used with queued connections and QSignalSpy. Needs a public default ctor. Task-number: QTBUG-62783 Change-Id: Ibc2b57b1b47a668f7a1f6fe9f591952d5275c7e2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | QuotaPermissionController: Factor out PermissionControllerJüri Valdmann2018-02-133-28/+88
| | | | | | | | | | | | Task-number: QTBUG-62783 Change-Id: I15fdfe6b0d4e8517b8f5752bd1af5c5a321e9cd0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | QuotaPermissionController: Use implementation subclassJüri Valdmann2018-02-135-76/+61
| | | | | | | | | | | | | | | | Try to separate quota-unrelated bookkeeping from quota-specific glue code. Task-number: QTBUG-62783 Change-Id: I0c7c3fd554a4b3a195a99ff4034f158f2547eecb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-123-3/+6
|\ \ | | | | | | | | | Change-Id: If971fbfcb158c921e2328dfcdef3bd3322f30c4b
| * | Ignore PKG_CONFIG* shell exports for YoctoMichal Klocek2018-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yocto sets GN_HOST_PKG_CONFIG script for native tools builds, therefore skip host pkg-config script generation even if PKG_CONFIG* shell variables for target are exported. Task-number: QTBUG-66275 Change-Id: I4a9939cd67ca5f32faeb827b5df0d3274ae7c30e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10.1Michael Brüning2018-02-052-1/+4
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/core/web_engine_context.cpp Change-Id: I004994a0ab6dbc54370b6973de1816cd673154c6
| | * Shutdown storage in browser context adapter destructorMichal Klocek2018-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Shutdown storage should take place in destructor, otherwise it might get recreated on web content destruction. Task-number: QTBUG-66081 Change-Id: Ibba3fce50e05e09131cf45061320a9f99267babd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Disable shared workersAllan Sandfeld Jensen2018-01-312-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feature has been redesigned for security reasons in 64. [ChangeLog][General] SharedWorkers have been disabled as they have been changed in the newest spec for security reasons. Change-Id: I3d0e03f170ef646a0352a38b65030bb4c06f3397 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * | Merge 5.10 into 5.10.1Oswald Buddenhagen2018-02-023-25/+36
| |\ \ | | | | | | | | | | | | Change-Id: Iaa781d5fbfec992eb5c2ac4055b7ac968cc1905e
| * | | Update ChromiumAllan Sandfeld Jensen2018-02-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in the last set of security updates from Chrome 64 Changes: 0d62ec3da6 [Backport] Block dotless-i / j + a combining mark 5cb725e1b4 [Backport] [Autofill] Use ShadowDOM placeholder to preview suggestions. 2d07ab2066 [Backport] [M64 branch] Add a few more confusable map entries 1d1c8edbe6 [Backport] Inherit referrer and policy when creating a nested browsing context 72eab06955 [Backport] Restrict the xss audit report URL to same origin 65819c3399 [Backport] TopSites: Clear thumbnails from the cache when their URLs get removed c858cc7609 Work-around internal compiler error in gcc 7 and 8 Task-number: QTBUG-66124 Change-Id: I9961dbae2ef1db798042cc31e5c1c8c7032a6e0c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Update ChromiumAllan Sandfeld Jensen2018-02-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in the second set of security updates from Chrome 64 Changes: cf3a94e300 [Backport] Merged: Reland "[wasm] Gracefully handle malformed custom sections in WebAssembly.Module.customSections()." ce4d3b4e0a [Backport] Implement 2D texture uploading from client array with FLIP_Y or PREMULTIPLY_ALPHA. 66a21db864 [Backport] Fixed bug where PlzNavigate CSP in a iframe did not get the inherited CSP 176f276a43 [Backport] Fix for URL spoof caused by deletion of speculative RFH 652815756e [Backport] Fix issue with pending NavigationEntry being discarded incorrectly 23fb7e37ae [Backport] Fix issue with pending NavigationEntry being wrongly deleted 74f10ff13d [Backport] Simplify WebGL error message 6f4d9abf1f [Backport] Add back support for "none" referrer policy 232288de9e [Backport] Validate frame after conversion in chrome.send Task-number: QTBUG-66124 Change-Id: Ibc40fdcdbdd99c711f48974f38f549e661eef4b5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Update ChromiumAllan Sandfeld Jensen2018-02-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: c21017c7e251 [Backport] M64: Ensure clamped time always moves forward 966fee89515d [Backport] [pdf] Use a temporary list when unloading pages 631144d9f0b7 [Backport] Downloads : Fixed an issue of opening incorrect download file 439b32a6aa2c [Backport] Chromium-side changes for BoringSSL cherry-pick. 543692ef8d0e [Backport] Tighten about IntRect use in WebGL with overflow detection Change-Id: I6eeac4c28bba51b46bf7b825478dd9e2f7734865 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | | Add checks for offTheRecord profileMichal Klocek2018-02-121-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user creates offTheRecord profile but later uses any of the api calls to change storage location will couse undesired effect of regenerating storage information. Change-Id: Iac34c697881ba7761033130a7b2a4002b6a0d6bd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | Correct documentation for storage pathsMichal Klocek2018-02-121-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Udpdate docs and profile unit test for storage paths. Change-Id: I646a33571ad8458af4efcddf310489cdde3a4606 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | | Remove unused GetCachePath()Michal Klocek2018-02-122-6/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I9560c6a4618eec7caebbbd147cd170bea74a01aa Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | | Remove unnecessary qguiapplication_p.h includeAlexandru Croitor2018-02-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The include was previously used for implementing QWebEnginePagePrivate::unhandledKeyEvent which called QGuiApplicationPrivate::instance()->shortcutMap.tryShortcut(event). This logic has now been moved to render_widget_host_view_qt.cpp. For now, at least remove it from this file. Change-Id: I516a659b2fb21782aabac7e7de8c1f93d0dbef91 Task-number: QTBUG-63098 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* | | | Remove usage of private call QWidgetPrivate::updateWidgetTransform()Alexandru Croitor2018-02-081-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to be needed in 5.6 for IME window placement purposes, but since 5.7 when we switched to using QQuickWidget instead of QOpenGLWidget as a result of commit 800365f6faad962a4dd2e71173527d285a3f62b5, the updateWidgetTransform gets called implicitly because we forward FocusIn events to QQuickWidget::event, which forwards them to QWidget::event which calls updateWidgetTransform for us. Task-number: QTBUG-63098 Change-Id: I0a0ba50c1491797b37765d26d761c358c156950f Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | | Merge dev into 5.11Oswald Buddenhagen2018-02-0611-53/+94
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: Iad50b7865d6861bb15b85e6abe455aae2802ea4b
| * \ \ \ Merge "Merge remote-tracking branch 'origin/5.10' into dev" into ↵Allan Sandfeld Jensen2018-02-0611-53/+94
| |\ \ \ \ | | | | | | | | | | | | | | | | | | refs/staging/dev
| | * \ \ \ Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2018-02-0211-53/+94
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/download_manager_delegate_qt.cpp src/core/download_manager_delegate_qt.h src/core/render_widget_host_view_qt.cpp src/core/web_contents_adapter.cpp src/webengine/api/qquickwebengineview.cpp tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp Change-Id: I2308414ce257ae5bb0fc9f6493aa111a267ff39b
| | | * | | Fix crashes of url load qml testsMichal Klocek2018-01-313-25/+36
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we can get QuickWebEngineViewPrivate::loadFinished while still being in RenderFrameHostImpl::OnDidStopLoading, unfortunately if user connects onLoadingChanged signal with new url load request this will end up in DiscardUnusedFrame and delete on RenderFrameHostImpl which is still on the bottom of the stack. Use QTimer::singleShot to return to the event loop before emitting load handling signals. Post all load handling calls with singleShot to avoid out of order load "signals" delivery in some cases. Emitting signals should be done from WebContentsAdapterClient to make sure the destruction of WebConentAdapterClient prevents emitting signals on already deleted adapter. Task-numbmer: QTBUG-65813 Change-Id: I93263876fb14bd959ba951463c8aeb5155f04a4f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Add 32bit host compiler testMichal Klocek2018-01-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 32bit compiler is required for creating v8 snapshots. Task-number: QTBUG-65004 Task-number: QTBUG-64869 Change-Id: I0a7a351208768f0b12900fac14d3abd5c8d99fa2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into ↵Allan Sandfeld Jensen2018-01-244-11/+18
| | | |\ \ | | | | | | | | | | | | | | | | | | refs/staging/5.10
| | | | * | Merge remote-tracking branch 'origin/5.9' into 5.10Allan Sandfeld Jensen2018-01-244-11/+18
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/download_manager_delegate_qt.cpp Change-Id: Ica57e582a323c6bd014a64bb615dd9454e656548
| | | | | * Fix QWebEngineDownloadItem::type()Jüri Valdmann2018-01-193-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-62640 Change-Id: I2b16f24533b38c20a7071319723382ba240e35f3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | | | | * Fix incorrect GLX pbuffer attributes terminatorFrank Richter2018-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The glXCreatePbuffer() documentation states that the attributes list must be terminated with "None or NULL". However, GLX_NONE does not have a null value. Mesa is sensitive to this. Change-Id: I9606d95a6a0dadec446496abb8e0213950e3d700 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | | * | | Fix random crashes on exitMichal Klocek2018-01-243-3/+8
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroy WebContentsDelegateQt before WebContents, since it references already partly deleted WebContentsAdapterClient object. This prevents calls by navigation handling on already destructed web contents adapter client. Task-number: QTBUG-65647 Task-number: QTBUG-47945 Change-Id: I0ed5887b337a43ab89ecbfe05130691b5f1f37ec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Add pkg-host wrapper scriptMichal Klocek2018-01-231-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we need pkg-config host for cross-builds to build build tools. Unfortunately if build environment exports PKG_CONFIG_* variables pkg-config will pick them up also for host builds, which can lead to compile errors. Create pkg-config-host_wrapper which explicitly unsets PKG_CONFIG_* variables. This is a temporary workaround till proper solution is implemented in qtbase. Task-number: QTBUG-65079 Change-Id: I9aff4a27ba62e096ed4c023cf022a41833260178 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Use correct margins when printing with QPrinterSzabolcs David2018-01-232-18/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Margins were applied two times: PrintViewManagerQt included them when rendering to a temporary PDF, then QPrinter applied them when printing. This patch changes the parameters of PDF generation to not contain the area of margins. This way the user-provided QPrinter can handle it without any kind of customization. Task-number: QTBUG-65715 Change-Id: Ie32785857e5195aa21c6e2ccb7ebd1e6f6ecd954 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | | * | Fix enable/disable precompiled headersMichal Klocek2018-01-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 'enable_precompiled_headers' instead of 'disable_precompiled_headers' Change-Id: I23af6fe1c24a6ccc14d31f009710ebbc4cc2f716 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Deselect text on each fourth clickSzabolcs David2018-01-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Triple click selects the entire paragraph and it should be deselected on a quadra click. Task-number: QTBUG-65649 Change-Id: I87c9405a202d8b6eacd7c19dbbcb051756c41220 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | | Merge dev into 5.11Oswald Buddenhagen2018-02-0656-437/+581
|\| | | | | | | | | | | | | | | | | | | Change-Id: Iaa5a467096e4915bbb5a7b0486fb08101af3749e
| * | | | Update ChromiumAllan Sandfeld Jensen2018-02-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: 37034957c1 FIXUP: Adapt licenses.py for qdoc needs 3541bcae07 Import ProtocolHandlerRegistry and related classes eb80f23942 Adapt ProtocolHandlerRegistry for WebEngine 3fa04d2288 FIXUP: Forward declare newer EGL typedefs Change-Id: I198687ac0b66e5ac4a4a3c2d3da73de49fd0c513 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Initialize FeatureList earlyAllan Sandfeld Jensen2018-02-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid crashing on a check of features being accessed before. Change-Id: I7aa97141b6a71ded534b1ebd3d2a750892b07221 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * | | | Merge remote-tracking branch 'origin/5.11' into devAllan Sandfeld Jensen2018-02-0225-229/+1205
| |\ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: I454bb7216b013cc9aa9ee660893fe37034fd50e1
| * | | | Support regex format include rules in user scriptsPaul Clark2018-01-262-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For user scripts with `@include` and `@exclude` directives in their headers, if the value starts and ends with `/` then assume it is a regular expression to be matched against a URL. This feature has been in the original greasemonkey module since 2011 and currently in webengine regex include rules are being blindly passed to the glob matcher. An alternative to this approach of leaving the bracketing slashes on the values as a kind of in-band signalling (and making the glob escaping conditional) would be to add new members to the UserScriptData struct for holding regex patterns. This commit also applies cleanly to v5.8 and every release after it. [ChangeLog][][UserScript] User script metadata parsing now supports regular expressions in @include and @exclude rules. Task-number: QTBUG-65484 Change-Id: Ie2e483419f6784f995131ffb7d2d5e91c2c55b1d Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Szabolcs David <davidsz@inf.u-szeged.hu> Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 09:10:14 +0000