diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2018-08-20 16:26:03 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-21 15:18:19 +0200 |
| commit | be18c1dcfa68328acdf11e0a534749d9a5d75f8b (patch) | |
| tree | 53a7b347d2771f4502338ac973a80a37edacdee7 /examples/webengine/recipebrowser/resources/pages/assets/3rdparty/qt_attribution.json | |
| parent | b74e93a9b07243da4f3d2784cde49916de455364 (diff) | |
| parent | e56dd7e37ea96c4ba1354e319bdaa9d01c401747 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
configure.json
examples/webenginewidgets/markdowneditor/resources/3rdparty/marked.js
examples/webenginewidgets/markdowneditor/resources/3rdparty/qt_attribution.json
examples/webenginewidgets/markdowneditor/resources/markdowneditor.qrc
mkspecs/features/platform.prf
src/3rdparty
src/core/media_capture_devices_dispatcher.cpp
src/core/net/url_request_context_getter_qt.cpp
src/core/net/url_request_context_getter_qt.h
src/core/web_contents_adapter.cpp
Change-Id: I467133ba455b1f85f6bb61793794c31cb1094541
Diffstat (limited to 'examples/webengine/recipebrowser/resources/pages/assets/3rdparty/qt_attribution.json')
| -rw-r--r-- | examples/webengine/recipebrowser/resources/pages/assets/3rdparty/qt_attribution.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/webengine/recipebrowser/resources/pages/assets/3rdparty/qt_attribution.json b/examples/webengine/recipebrowser/resources/pages/assets/3rdparty/qt_attribution.json index 42947ca0b..a6c68f46f 100644 --- a/examples/webengine/recipebrowser/resources/pages/assets/3rdparty/qt_attribution.json +++ b/examples/webengine/recipebrowser/resources/pages/assets/3rdparty/qt_attribution.json @@ -5,12 +5,12 @@ "QDocModule": "qtwebengine", "QtUsage": "Marked is used in the WebEngine RecipeBrowser example", "QtParts": [ "examples" ], - "Files": "marked.min.js", + "Files": "marked.js", "Description": "A full-featured markdown parser and compiler, written in JavaScript. Built for speed.", "Homepage": "https://github.com/chjj/marked", - "Version": "0.3.6", - "DownloadLocation": "https://github.com/chjj/marked/blob/v0.3.6/marked.min.js", - "Copyright": "Copyright (c) 2011-2014, Christopher Jeffrey", + "Version": "0.4.0", + "DownloadLocation": "https://github.com/markedjs/marked/blob/0.4.0/lib/marked.js", + "Copyright": "Copyright (c) 2011-2018, Christopher Jeffrey", "License": "MIT License", "LicenseId": "MIT", "LicenseFile": "MARKED-LICENSE.txt" |