summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add Full Screen setting to quicknanobrowserPeter Varga2015-10-271-1/+9
| | | | | Change-Id: I264a0317d46b79cce8481b3227307115f64520d8 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Check if platform is supported first.Michael Bruning2015-10-261-5/+5
| | | | | | | | | | The former location of the check at the end of the function caused misleading error messages about missing features to be printed as the reason for the skipped build, when actually the whole platform was not supported by Qt WebEngine. Change-Id: Ie8ad80b8716b7212ae96ce6ed2e2ab51f396d219 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Revert "Fix build with freetype2 depending on harfbuzz"Allan Sandfeld Jensen2015-10-232-6/+3
| | | | | | | | | | | We should trust the global Qt configuration, the same issue should have been solved in qtbase already. This fixes RedHat builds where FreeType2 reports a wrong version. This reverts commit 981e38d2dc82c047c6ad8ec19427d3ac7434dc3c. Change-Id: I662105521b277585c83335e20831692f990e4dc1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Compilation fixes for MSVC 2015 (64 bit)Kai Koehne2015-10-231-0/+0
| | | | | | | Take in compile fixes for new ninja, and MSVC 2015 (64 bit). Change-Id: Iaa2531a507e2c7034dfe39813c952d7ad75e7285 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Remove revisioning from WebEngineSettingsSzabolcs David2015-10-232-3/+5
| | | | | | | | | | We can't use revisions in uncreatable types because QTBUG-40043 is affecting our API. Change-Id: Id9bf18fe8cfda590079ed72d7ca8b1c298aff90e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Remove const from QWebEngineCookieStoreClient::FilterRequest in ↵David Rosca2015-10-233-4/+4
| | | | | | | | | | setCookieFilter callback FilterRequest can be rejected by changing FilterRequest::accepted to false, so it should not be const. Change-Id: I87cd0f97dd442c6676aeeda9e1cbeb582eb06741 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Mark property with REVISION, not methodsKai Koehne2015-10-221-3/+3
| | | | | | | | Marking ordinary member function with REVISION is pointless. Change-Id: I9b22ed56b6843897cf80c610f46d0c45c7918b31 Reviewed-by: Szabolcs David <davidsz@inf.u-szeged.hu> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Fix build of tst_qwebenginepageSzabolcs David2015-10-211-2/+8
| | | | | Change-Id: Ic6cff6bed5ec1120ce8147ea02eeaea697788d16 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Fix crash in triggerDialog() in shutdown phaseKai Koehne2015-10-211-1/+4
| | | | | | Task-number: QTBUG-48645 Change-Id: I3dafce799ad70436d50ce8dbc936ea34a6ed4a61 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: add information about the core classes to the overviewLeena Miettinen2015-10-201-1/+14
| | | | | | Change-Id: I59bf85d5f7d67b3ff6359f37cdc1b6c437552a97 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-201-1/+1
| | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: I43f7c0252f1d9aff77a112a7db02bc05406ba2db Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Enable building with MSVC 2015Kai Koehne2015-10-194-4/+4
| | | | | | | | | Enable MSVC 2015 in prechecks and fix error C2308: concatenating mismatched strings Task-number: QTBUG-47541 Change-Id: Ia583e2963c7e6ef8327909b91c8df04aeb17eb07 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix ABI breakage due to fullscreen featureAllan Sandfeld Jensen2015-10-1917-80/+222
| | | | | | | | | | | We can not add a new virtual method without breaking ABI on some platforms, instead we need to use a setter. The API now uses a request object, and a separate signal for canceling, since canceling can not be rejected. Change-Id: If8069c343e86926293c30e8de179bf4e3cbd5886 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Do not require to subclass/install QWebEngineCookieStoreClientKai Koehne2015-10-1912-94/+103
| | | | | | | | | The class has only setters and getters, except for the virtual acceptCookie method. By replacing this method with a setCookieFilter callback we can avoid the need of users to subclass the client. Change-Id: Id78c01fc103b8d9cc267594527239b598e8975f1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Decouple scheme and url scheme handlerAllan Sandfeld Jensen2015-10-169-116/+75
| | | | | | | | | Remove the scheme from the url scheme handler constructor, this way the same handler can handle multiple schemes, the API look more natural and we can get rid of the private class. Change-Id: I33906b8a5ea51641e28a53f93f4feb1472c24baf Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Set Qt::AA_ShareOpenGLContexts in QtWebEngine::initialize()Kai Koehne2015-10-161-0/+3
| | | | | | | | | | | QtWebEngine::initialize() does the same as passing AA_ShareOpenGLContexts to the QCoreApplication constructor, so it should also behave the same. Other Qt classes (e.g. QOpenGLWidget) actually check for the attribute to adapt. Change-Id: I6068a9a3f5736c708944d69c0df853143c3e9dd1 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Document QtWebEngine::initialize()Kai Koehne2015-10-163-3/+27
| | | | | Change-Id: If0dd01dadfb65cdf36f996347ef625c082057b56 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Check for OS X minimum version early onKai Koehne2015-10-151-4/+12
| | | | | | Change-Id: Ib7f9af5784a5e57767e70a1aa580a98d75e129be Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Remove special case for msvc2013 when checking for c++11Kai Koehne2015-10-131-1/+1
| | | | | | | | Since qtbase commit cc67960f msvc enables c++11 for MSVC 2012 and newer, too. Change-Id: If73850759bbbb107c99e2dd6e4066e15b73d8f6c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix build with freetype2 depending on harfbuzzAllan Sandfeld Jensen2015-10-122-3/+6
| | | | | | | | | Chromium uses system freetype2 by default but not harfbuzz by default, since some newer versions of freetype2 depends on harfbuzz, we need to configure Chromium to use system harfbuzz in those cases. Change-Id: Ic15abe85c5b7e5ef1c3d82420efbc8605c2fe1ae Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Clean up configure syntaxAllan Sandfeld Jensen2015-10-123-30/+33
| | | | | | | | Imports use? qmake macro from QtWebKit and use it to make checks simpler and keep the webengine config in WEBENGINE_CONFIG. Change-Id: Ic0f1fca45ebc292d8146107697f9d3ca3764dfb4 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Make NSS vs BoringSSL choice more flexibleAllan Sandfeld Jensen2015-10-123-5/+21
| | | | | | | | Make the NSS library optional on Linux to reduce the hard coded difference between embedded and desktop builds. Change-Id: I3d7f703ead0ff325ffd2ae272e7e4c2d5258fc25 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Remove private API warning from qwebengineurlrequestjob.hKai Koehne2015-10-121-11/+0
| | | | | Change-Id: Ie2c9e3ac60790e49a449c473cd9fb60ef698b6de Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Remove hard dependency on libjpeg on Linux.Michael Brüning2015-10-121-1/+0
| | | | | | | | It made the build fail on systems that use libjpeg-turbo. Task-number: QTBUG-48606 Change-Id: I1aa6acab1627d3f4613b4ca39837b6deb25d3cc0 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Add firstPartyUrl to QWebEngineUrlRequestInfoDavid Rosca2015-10-127-1/+43
| | | | | | | | Add firstPartyUrl that can be used to identify third-party requests. Change-Id: I2b8e48ff0a1a4402af224c80f91d4e599a61a89c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* add RequestClose web actionJoerg Bornemann2015-10-0920-14/+121
| | | | | | | | | | | | | | | Web pages can set the onbeforeunload handler to let the user confirm whether to leave the page or not. Until now, only when leaving the page via a link, a confirmation was shown. Before actually closing a web page, applications can now trigger the RequestClose web action. This will give the use the chance to confirm or deny the close request. If the request is confirmed, the signal windowCloseRequested is emitted. Task-number: QTBUG-36155 Change-Id: Icc1fabc37a2ac537f674c2f00bc8966e4dc4e610 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* remove unused code from demobrowserJoerg Bornemann2015-10-091-15/+0
| | | | | | | | | | | Remove QWEBENGINEPAGE_ISMODIFIED block from demobrowser. This feature is not implemented. It is questionable whether it should be re-introduced in its old form. Checking whether the user should think twice about leaving the current page is usually implemented by the HTML page itself. Change-Id: I51544129b26f3e0c132e2c983c2ce1744cc19123 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* add signal WebEngineView.windowCloseRequestedJoerg Bornemann2015-10-093-1/+13
| | | | | Change-Id: I47919cb21e084eaafc39411c634850c2845f5acc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: add missing parameter name to function signature in docsLeena Miettinen2015-10-091-2/+2
| | | | | | | | ...to fix a QDoc error. Change-Id: Id074b1e43fd1739a6dddd77b922b2483d0879727 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Liang Qi2015-10-082-5/+16
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-082-5/+16
| |\ | | | | | | | | | Change-Id: I1ac58ada3f32821d62d49e5fcb12546aa9e75fb4
| | * fix python version checkJoerg Bornemann2015-10-061-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The python code that is used to determine the version number did not work with python3. In python3 print is a real function and must be called as such. Use positional accessors to be compatible with python < 2.6. Also extend the error message for users that attempt the build with python3. Task-number: QTBUG-48507 Change-Id: I49e1fb77c2cc421ac1faed8d8143bf605fbde700 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * Parse suggested filename from content-dispositionAllan Sandfeld Jensen2015-09-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium hasn't parsed content-disposition by the time we get the download item, so we need to call the parsing manually. Change-Id: I105d0c6904dd764b368cb774e377a6028c082513 Task-number: QTBUG-48206 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Doc: Collect external links into a single fileTopi Reinio2015-10-084-7/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move external links to a dedicated .qdoc file for maintainability. Add an \externalpage that's marked internal to work around the issue of each occurrence of 'WebEngine' being autolinked to the WebEngine QML type, which is typically not desired. Change-Id: Icfdbefac7372866f5258378aa59daba1a97cc776 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | | Doc: Use \qml for code snippets where possibleTopi Reinio2015-10-084-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc's QML parser works OK for code snippets that include a full type declaration; use \qml for these snippets to get autolinking to QML types working. Use \badcode for codeblocks that are not code or have nothing to link to. Change-Id: Iffd2f356bf0b3efc854a3755873e66f8c9478cac Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | | Improve documentation of QWebEnginePage::acceptNavigationRequestKai Koehne2015-10-081-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: Ic4f91fa7927c18b53c6b0a0f69ee38905715eb10 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Improve runJavaScript documentationKai Koehne2015-10-082-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Mention that the script will run in the same JavaScript world as scripts that are part of the page. Also link to new scripts API. Change-Id: I4dd80fdd84644b1fa4ce6c63ab07c1dbba855389 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Keep order of scripts added to QWebEngineScriptCollectionKai Koehne2015-10-084-31/+21
|/ / | | | | | | | | | | | | | | | | Use a QList instead of a QSet to store the scripts in the collection. This avoids situations where two scripts injected depend on each other, and fail or succeed depending on the semi-random order that QSet imposes. Change-Id: I44d5d89866ff2431544cc91afb1c102d93daa5da Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix compilation with latest qtbaseKai Koehne2015-10-081-2/+2
| | | | | | | | | | Change-Id: I1040dab62b7c795dbaf3899304501917993b06d6 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update .qmltypes fileKai Koehne2015-10-081-7/+92
| | | | | | | | | | Change-Id: I492d225b8b217e7cef4548d31d96c351a6fa2407 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: edit link to Qt WebKit docs to point to archiveLeena Miettinen2015-10-072-3/+6
| | | | | | | | | | | | | | The Qt WebKit docs are not part of Qt 5.6 documentation. Change-Id: Iac913b2b94f899b0c14398c5a864b647c56995c5 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Doc: add docs for QWebEngineView::renderProcessTerminated()Leena Miettinen2015-10-071-0/+8
| | | | | | | | | | Change-Id: I055467595e6c922bc95fabf63555c7225de6d626 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: add docs for WebEngineHistoryListModel typeLeena Miettinen2015-10-071-4/+26
| | | | | | | | | | | | Task-number: QTBUG-48596 Change-Id: Icda2dd21a198ba409e3cf8c53d9ff449f4675902 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Doc: remove doc config file from Qt WebEngineWidgets submoduleLeena Miettinen2015-10-0710-74/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps maintaining the doc dependencies. All Qt WebEngine module docs are now generated in the /qtbase/doc/qtwebengine/ folder. Note that you must run qmake -r for the docs to be generated correctly after applying this patch. Add Qt WebEngine C++ Classes page that lists the C++ classes for the submodules. Modify snippet and example paths accordingly. Change-Id: I59431c5f766f30b59654ca4e2219b76c79137225 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Doc: edit QWebEngineUrlSchemeHandler docsLeena Miettinen2015-10-061-2/+11
| | | | | | | | | | | | | | | | | | - Add missing docs - Edit for grammar Change-Id: I407818d66f17a354cf3f5051bed5a648bc807424 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Doc: edit QWebEngineUrlRequestJob docsLeena Miettinen2015-10-061-9/+29
| | | | | | | | | | | | | | | | | | - Add docs for the Error enum - Fix incorrect argument name - Edit for grammar Change-Id: I6c4364eb0a4dd52e38eaf1cde46aec4ddff99532 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Doc: edit QWebEngineView docsLeena Miettinen2015-10-061-57/+48
| | | | | | | | | | | | | | Fix grammar, style, and punctuation. Change-Id: I0d6a8f9ccda16c81f7bc32194d09c5ca0e8761ce Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Doc: add docs for WebEngineView 1.2 APILeena Miettinen2015-10-061-0/+136
| | | | | | | | | | | | Task-number: QTBUG-48560 Change-Id: I65349be1696b75dc303ae15c81f57094eea0ede4 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Doc: WebEngineSettings as uncreatable typeLeena Miettinen2015-10-061-5/+7
| | | | | | | | | | | | Task-number: QTBUG-47911 Change-Id: Icea7a63e7d84ec23c98a6bcef4a8bdc624473572 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Document WebEnginePage API only available in WebEngine 1.1Kai Koehne2015-10-061-0/+3
| | | | | | | | | | | | Task-number: QTBUG-47907 Change-Id: Ib66038fa61e091cafc7c27a87ca59c4d68b48b48 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 09:24:30 +0000