summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Fix assert on exitAllan Sandfeld Jensen2015-09-103-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove frame loading error-page when frame is deleted, and make sure WebContents is destroyed before the observer so the observer can observe the full live-span including deletions.. Task-number: QTBUG-47945 Change-Id: I56bec611b8bfbfc6f75a1bc2108efbc80a81729b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * do not generate qmake_extras.gypi in the source directoryJoerg Bornemann2015-09-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Among other things, we store the used compiler in there. This information belongs into the build directory. Otherwise switching toolchains becomes challenging. Task-number: QTBUG-43014 Change-Id: I9bec26a235f5251322792632d4667cc71210286d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | Mark qrc:// as a secure schemeKai Koehne2015-09-241-0/+6
|/ / | | | | | | | | | | | | | | | | This avoids deprecation warnings when using e.g. WebRTC (see also https://goo.gl/rStTGz ). Task-number: QTBUG-48272 Change-Id: Ib3d076ccc9eff0344d60f82b7671b047c0b3d423 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | fix debug_and_release build on WindowsJoerg Bornemann2015-09-243-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The public API symbols are compiled in a static library that's linked to core with --whole-archive when using gcc. There's no equivalent for this in MSVC. We hacked around this limitation in commit 38944be4 by creating a source file that includes every public header. Unfortunately this breaks debug_and_release builds, because we must inject this generated source file as absolute path, and gyp will generate the same object file for every source file that's specified with an absolute path... This reverts commit 38944be4 and replaces the work-around by simulating -whole-archive on MSVC. This is done by passing all object files that belong to qtwebenginecoreapi.lib to the linker via a response file that is created when building qtwebenginecoreapi.lib. Task-number: QTBUG-48376 Change-Id: Iaa991fe96a2c336d982d29d6924ce950c0be5398 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Support building on ARMAllan Sandfeld Jensen2015-09-231-36/+38
| | | | | | | | | | | | | | Fix ARM linux builds on ARM Change-Id: Ifd97a0286b509003d0c7959654d406e271349cd7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: Fix a number of documentation warningsTopi Reinio2015-09-232-25/+25
| | | | | | | | | | | | | | | | Fix minor language issues, and link to QML signals similarly as one would to a method. Change-Id: Ib9da8c66fd10c5543f5272f5bf6e1027e84b9a73 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: edit QWebEngineHistory docsLeena Miettinen2015-09-224-31/+24
| | | | | | | | | | | | Change-Id: Id52add61d11723e8bb12957af2f319a7d85bc69c Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Clarify unit of [set]HttpCacheMaxSizeKai Koehne2015-09-221-2/+2
| | | | | | | | | | Change-Id: I5db2aebf3cd300344bdafe8bba4169d54a0f3c24 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Use GYP_CONFIG over GYP_ARGSAllan Sandfeld Jensen2015-09-211-19/+19
| | | | | | | | | | | | | | | | Moves the handling of GYP_CONFIG down so that it may be used consistently for all GYP arguments in gyp_run.pro. Change-Id: Ic63d652701dbae4094572b2401d020fc058ea7ac Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Do not override use_system_ffmpegAllan Sandfeld Jensen2015-09-211-1/+1
| | | | | | | | | | | | | | | | We can use proprietary codecs with system FFMPEG if system FFMPEG is build with them. If both are set we should trust the configuration. Change-Id: I702dcdbed4b20405c7affa7af0d87ba446b44ca2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: edit QWebEnginePage docsLeena Miettinen2015-09-213-92/+154
| | | | | | | | | | | | | | | | | | | | - Add missing documentation - Edit for grammar and style - Fix links Change-Id: I9e8387fa08f8e7e73c636a516b1f87eb10973e73 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Update dependenciesAllan Sandfeld Jensen2015-09-181-0/+0
| | | | | | | | | | | | | | | | Add more pkg-config based libraries that we need to build Qt WebEngine and update Chromium SHA so that we do not need ATK. Change-Id: I713823e3dcad9b9f5a112d500d23281ac59c307b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Disambiguate debug and release builds of libqtwebenginecoreapiKai Koehne2015-09-172-2/+4
| | | | | | | | | | | | | | | | | | | | Though the destination directory for a debug and a release build differ, the static library is still intermediately placed in a common directory. This patch adds a unique suffix to the library name to avoid clashes. Task-number: QTBUG-48287 Change-Id: I299704529539d0b7ed9aaf1df06245ae1c3ce363 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Improve WebEngineProfile documentationKai Koehne2015-09-142-5/+7
| | | | | | | | | | Change-Id: Ia7b160444a6c8902c6174d9859b3989a9442bc2e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Emit a signal when the rendering process exits.Jake Petroules2015-09-1011-1/+88
| | | | | | | | | | | | | | | | | | This allows users to implement a "sad tab" feature and/or track rendering process crashes using a crash reporting service. Task-number: QTBUG-48227 Change-Id: I97ef934fe5d0912cd0f41967a39052316b3c66b0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add basic documentation of remote devtoolsAllan Sandfeld Jensen2015-09-102-0/+57
| | | | | | | | | | | | | | | | Briefly document how to activate and access the developer tools Change-Id: I5ab697d97ba2873e41074b2436b271ad0fa8a448 Task-number: QTBUG-47914 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | remove cookie_monster_delegate_qt.h from private headerJoerg Bornemann2015-09-102-1/+6
| | | | | | | | | | | | | | Otherwise we cannot include qwebenginecookiestoreclient_p.h in tests. Change-Id: I1c45a097cfb81f29e71d0d954919541ccad0b64b Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* | Unite commmon linux platform configurationAllan Sandfeld Jensen2015-09-103-60/+44
| | | | | | | | | | | | | | Move duplicated linux configuration to linux.pri Change-Id: I9f6f876e09fb748fb78cfbd5201a4326693f0be9 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Doc: QWebEngineSettings::WebAttribute::FullScreenSupportEnabledLeena Miettinen2015-09-101-0/+2
| | | | | | | | | | Change-Id: I5e93f7f7238a49cb73bbe9bd28f24289f8d9fd13 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Doc: fix \sa linksLeena Miettinen2015-09-091-2/+2
| | | | | | | | | | | | Change-Id: I522918064ef8139eff4efa0461030baeb7083b76 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Make save action context menu consistentAllan Sandfeld Jensen2015-09-092-4/+4
| | | | | | | | | | | | | | | | We should use a consistent naming format for the three download/save web actions. Change-Id: I54fabc88a7adbbf7d4f861b8ddde851ebf4ec872 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add HTTP and proxy authentication dialogs to the QtQuick APIPeter Varga2015-09-096-2/+159
| | | | | | | | | | Change-Id: Idba4c32df3aaecabfbdca0c79c80317e2e4577ba Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge branch '5.5' into 5.6Allan Sandfeld Jensen2015-09-0821-260/+1090
|\ \ | |/ | | | | Change-Id: Idafba4d47393638cfc72fd02be092b67bb8cbd8c
| * Update WebEngineView documentationKai Koehne2015-09-072-35/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The split suggested in the comment does not work: You have to keep the complete documentation for a QML type in one file, the documentation bits in qquickwebengineview.cpp were silently ignored so far. This change moves over the bits from .cpp , adds missing documentation for new elements and sanitizes the output of others. Task-number: QTBUG-47909 Change-Id: Ie1ebb5a9fe952c7a76c8fe1b67135614ca90ce7a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Break destruction cycle between DownloadItem and WebEngineProfileKai Koehne2015-09-044-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All QQWebEngineDownloadItem objects are destructed as child objects of QQWebEngineProfile. However, they try to 'call back' to the already half-destructed QQWebEngineProfile object to unregister themselves. Avoid this by tracking the lifetime of the QWebEngineProfile with a QPointer. Task-number: QTBUG-48088 Change-Id: Ie6a76440ad9f37d7cbc38b4ce35bf5da785d0e2a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * fix includeJoerg Bornemann2015-09-031-1/+1
| | | | | | | | | | | | | | | | The global include must either be prefixed with private/ or locally included. Change-Id: I7933d940bdddae4975db8e58fe52a887adec51ff Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Update Chromium for cherry-picked security fixesAllan Sandfeld Jensen2015-09-031-0/+0
| | | | | | | | | | | | | | | | Includes fixes for CVE-2015-1284, CVE-2015-1290 CVE-2015-1291, CVE-2015-1292 and CVE-2015-1294. Change-Id: I6c51978452ebcf079dab75804560c5d0eafa81b1 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Doc: edit WebEngineProfile docsLeena Miettinen2015-08-281-55/+43
| | | | | | | | | | Change-Id: Ifdfb36206c31215687f913e6887c8f9125487cf1 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Update submodule for ICU fixAllan Sandfeld Jensen2015-08-281-0/+0
| | | | | | | | | | | | | | Pulls in the ICU overflow fix. Change-Id: I898bd9701b1c2df4eb55b11ee82eb7bab494af89 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Doc: edit QWebEngineDownloadItem docsLeena Miettinen2015-08-281-15/+16
| | | | | | | | | | | | | | | | Use same wording as for the QML type, where appropriate. Change-Id: Idb10f054f334056713bf902c68e567c70fe150f2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Doc: edit QWebEngineCertificateError docsLeena Miettinen2015-08-281-2/+3
| | | | | | | | | | Change-Id: I147f7e3da41804f7b28e08647a0b6d1756394e4f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Doc: edit WebEngineNewViewRequest docsLeena Miettinen2015-08-281-8/+7
| | | | | | | | | | Change-Id: I6597ce1b1bbb8a59f7852ee79c199c5774fc65b8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Doc: edit WebEngineLoadRequest docsLeena Miettinen2015-08-281-8/+10
| | | | | | | | | | | | | | | | | | | | - Add missing documentation - Replace "class" with "type" - Use standard phrasing - Edit for grammar and style Change-Id: I35bcb3c84e87257d56ee5d89847f8ecf302b205b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Doc: edit WebEngineDownload docsLeena Miettinen2015-08-271-34/+17
| | | | | | | | | | | | | | | | | | | | - Use the \value command for enum values - Use standard phrasing for property docs - Edit grammar and style Change-Id: Ia4cc6db4478264aeb87772088fdd58890423ee20 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Doc: Fix see also linkKai Koehne2015-08-271-1/+1
| | | | | | | | | | | | | | qquickwebenginecertificateerror.cpp:61: warning: Can't link to 'WebEngineCertificateError::certificateError' Change-Id: I436388a2cf24edaf159942e964b480b877907de2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Mark properties/slots new in Qt 5.5 to be only available in 1.1Kai Koehne2015-08-271-3/+3
| | | | | | | | | | Change-Id: Ib36ee2849616461b4214c912cde6b5c7a758b68b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix Q_PROPERTY declaration in QQuickWebEngineDownloadItemKai Koehne2015-08-271-1/+1
| | | | | | | | | | | | | | | | qquickwebenginedownloaditem_p.h:74: warning: Failed to parse token ( in property declaration Change-Id: I4d9bb4eed5f6fbcc4b81fdad94577f9f06daca39 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Update .qmltypes fileKai Koehne2015-08-272-7/+779
| | | | | | | | | | | | Change-Id: I2c3e529e79e3e0591abcfff922191cb3dc35f00a Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Fix documentation to advertise QtWebEngine 1.1 importKai Koehne2015-08-252-4/+4
| | | | | | | | | | Change-Id: I0f275c3228c44c3d2e081160653dd3e466c52596 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Doc: clean up QWebEngineSettings docsLeena Miettinen2015-08-243-79/+84
| | | | | | | | | | | | | | | | | | | | | | ... and the corresponding QQuickWebEngineSettings docs - Add missing documentation - Remove references to obsolete classes - Edit for grammar and style Change-Id: I368fff274609941d6435ddf3343b81bca6013945 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Qt Quick Menu: Delay destroying the menu instanceGabriel de Dietrich2015-08-181-1/+10
| | | | | | | | | | | | | | | | | | | | | | This is necessary on Mac, where we use native menus and, in order to support catching exceptions emitted from menu handlers, we queue the 'triggered' signal emission (see qtbase commit 08cc9b9991ae9ab51). This also means that the 'done' signal is emitted before we get a chance to receive the menu item's 'triggered' signal, resulting in a noop. Change-Id: Ie5f06521fb1cdd5def1517a908078c1dd62ab0d0 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
| * Update chromium submoduleKai Koehne2015-08-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | New changes: b34aef8 Revert "<third_party/jinja2> FIXUP: Prevent a python IOError on Windows" 759f070 <tools/gyp> Prevent a python IOError on Windows 1ee586d <chromium> Disable termination on out of memory. 0691b4e <third_party/WebKit> FIXUP: Prevent a python IOError on Windows 6e4f55a <chromium> MSVC: Fix build issues when using std::numeric_limits::max Change-Id: I703de804ce5fd0f5ff827a193a6cb175e292b337 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Enable building linux-clang platformAllan Sandfeld Jensen2015-09-072-2/+3
| | | | | | | | | | | | | | | | Adds the necessary flags to build with clang on desktop linux. Change-Id: I77f8937849bceefbae17158421a180e4a1adc2d3 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add AuthenticationDialogControllerPeter Varga2015-09-0610-31/+292
| | | | | | | | | | | | | | | | | | The new controller makes possible to handle authentication requests asynchronously. This is essential for the authentication support in the QtQuick API. Change-Id: Ib60b58448a60e817e64477529ec4bfd1535b3d19 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Make request job and request info methods consistentAllan Sandfeld Jensen2015-09-066-19/+35
| | | | | | | | | | | | | | | | | | | | Changes the method names so the two request representation uses the same method name and the same style of naming of actions on the requests. Change-Id: I409ed1a5f6ac0835878f65ee978b6f224e42aa20 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Remove rpath workaround from QtWebProcess build.Jake Petroules2015-09-061-17/+1
| | | | | | | | | | | | | | | | | | This also fixes a runtime failure when building the webengine module independently (for example, where QtCore and QtWebEngine* frameworks are located in different directories). Change-Id: I801d74da0be495089bf552b85b507918684b9685 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Read egldisplay from QPAAllan Sandfeld Jensen2015-09-061-5/+0
| | | | | | | | | | | | | | | | Follow up to 6e6e2655bf03f2cc903f17d9e5283a81a4a837c2, we should get egldisplay from QPA, otherwise we end up with the wrong values. Change-Id: I668511a1ae9ab6f4f5132707ae03afc3fe3722ac Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Bumb Chromium to include pkg-config fixAllan Sandfeld Jensen2015-09-061-0/+0
| | | | | | | | | | | | | | Fixes cross-builds. Change-Id: Ic06fcd65b34d1079d9cc7de6611ebf1fd93c0959 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Fix selectAll on data urlAllan Sandfeld Jensen2015-09-032-0/+3
| | | | | | | | | | | | | | | | SelectAll only works when there is a focused frame, so we must ensure a frame is focused when the web-contents requests focus. Change-Id: I00d670321b29342fcd447b4b07251df776019f1c Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Replace QObject::trKai Koehne2015-09-036-37/+37
| | | | | | | | | | | | | | Place translations in a better namespace than 'QObject' Change-Id: Id691050f2f50eba4f272b52ff36caf7056d017c2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
View Lorry Controller Status