summaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qmltests/data/tst_userScripts.qml
Commit message (Collapse)AuthorAgeFilesLines
* Fix handling of bad @match directivesSzabolcs David2018-04-271-0/+17
| | | | | | | | | User scripts with parse errors in their @match patterns were included on all pages. Don't allow to fallback to "@include *" in this case. Task-number: QTBUG-67726 Change-Id: I8172184e79fe3e515f391bc6cc8274a624e67a19 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Support regex format include rules in user scriptsPaul Clark2018-01-261-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Add profile-wide user scripts to the Quick APISzabolcs David2017-01-261-0/+19
| | | | | | | | Add API tests in order to try how it works in C++ and QML. Task-number: QTBUG-51034 Change-Id: I1680297e2dafba39dbd4b161f0dbdb14fb6d4243 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Speculative fix of user script QML testsPeter Varga2016-09-301-10/+11
| | | | | | | | The sequence of the titleChanged and loadingChanged signals is not guaranteed. Wait for both of them to avoid flaky behavior. Change-Id: I981cd20f6535187fa0f8144db0084c8bb64ab41c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Speculative fix of test_bigScriptAllan Sandfeld Jensen2016-09-261-2/+1
| | | | | | | Wait asynchronously on the title change. Change-Id: I4e3826c5206e1a1a77c095c3226406d4eee64eba Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-051-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove() and comboBoxPopupPositionAfterMove(). Conflicts: .qmake.conf src/3rdparty src/core/render_widget_host_view_qt.cpp src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-platform-notes.qdoc src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h tests/auto/widgets/qwebenginepage/BLACKLIST tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp tools/qmake/mkspecs/features/functions.prf Task-number: QTBUG-55158 Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4
| * Fix flaky qml user script testAlexandru Croitor2016-07-051-3/+3
| | | | | | | | | | Change-Id: I21dfb9146dad44329c490c1c6b32864c70384db3 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Parse metadata block in user scriptsSzabolcs David2016-07-071-0/+22
|/ | | | | | | | | | This allows WebEngine to build up user script objects from the metadata section of their source code. It also implements @include, @exclude and @match rules for restricting script injection to given URL patterns. Change-Id: Ic7b3023c0143643bfbf71adbfa25a8022b223fcf Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Updated license headersJani Heikkinen2016-02-011-23/+10
| | | | | | | | | | | | From Qt 5.7 -> tools & tests are licensed under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header (in those files which will be under GPL 3 with exceptions) Change-Id: I59fcbb8cd1ca42b1a5ef96577bcb35ea0af01b71 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* QQuickWebEngineView: add activeFocusOnPress propertyPierre Rossi2015-06-031-1/+1
| | | | | | | | | | This allows to use a WebEngineView to make a UI element that should not get focus, which can be useful inthe case of hybrid UIs. [ChangeLog][QtWebEngineQML][QQuickWebEngineView] Add activeFocusOnPress Change-Id: I0666f81badd135db0049e0dd7b0fc30d0765b1c9 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add tst_userScripts QML testSzabolcs David2015-04-091-0/+168
Change-Id: Id023c3f6e4be05c44314418511062015413d76c9 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>