summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into devwip/47-basedAllan Sandfeld Jensen2015-10-1490-696/+1299
|\ | | | | | | Change-Id: I0569b04ced3456a1d5d91e02e117963115fcf1b2
| * 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>
| * | Doc: add docs for WebEngineSingleton typeLeena Miettinen2015-10-061-0/+36
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-47912 Change-Id: Iabc06b4ce78eb81955d60cdebccef40fef9a21b3 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | Doc: add docs for uncreatable WebEngineHistory typeLeena Miettinen2015-10-061-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accessible by using the WebEngineView.navigationHistory property. Task-number: QTBUG-47908 Change-Id: Ib1baaa7690b0ca16ee67e76bc9ea2ece3d254f55 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | Remove unnecessay delegation over CustomUrlSchemeHandlerAllan Sandfeld Jensen2015-10-0616-200/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With QWebEngineSchemeHandler in QtWebEngineCore, we do not need the indirection and delegation CustomUrlSchemeHandler provided. This means the class can be removed and we can also store the handlers directly in BrowserContextAdapter and save a copy of the installed handlers in the QWebEngineProfile. Change-Id: Iabb5cc9d364c2f2a879bc77bfb2ff14b3c2ff640 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | fix link error with MSVCJoerg Bornemann2015-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since qtbase/e88334e0 we must not put MSVC linker flags into LIBS or LIBS_PRIVATE. QMAKE_LFLAGS is the right place. This fixes a build error with MSVC: LINK : fatal error LNK1181: cannot open input file '\OPT:REF.obj' Change-Id: I2971e412dd8d5cfe8b7aca218d679dd136019dd8 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Fix assert on deleting installed custom URL scheme handlerAllan Sandfeld Jensen2015-09-304-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the QObject::destroyed signal is emitted the inherited class parts have already been destroyed and thus it is no longer a QWebEngineUrlSchemeHandler and qobject_cast will return 0, which is asserted against. Change-Id: I7130c60a26088067930499a30e0081ed297a92d9 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | Update to Chromium 45.0.2454.101Allan Sandfeld Jensen2015-09-303-1/+2
| | | | | | | | | | | | | | | Change-Id: Ifda982e1bcfc2a0655e65a71321b137a348be865 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | Remove whitespaces from custom HTTP user agentsSzabolcs David2015-09-292-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents adding additional headers to the outgoing HTTP request through overridden user agent and unskips userAgentNewlineStripping API test. Change-Id: If9b3a88b0346058a7dc462471637d9777683fe82 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Doc: add requirements for building Qt WebEngineLeena Miettinen2015-09-292-0/+53
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-48097 Change-Id: I81665b615c6bb2a21d355fa1310ff8c1fae7e0b2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Doc: edit WebEngineView docsLeena Miettinen2015-09-291-89/+63
| | | | | | | | | | | | | | | | | | | | | | | | - Edit for grammar and style. - Use QDoc commands consistently. Change-Id: Iecfeaa17307befee73057f1f7760d6e10ae79e77 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | update tst_publicapiJoerg Bornemann2015-09-281-79/+132
| | | | | | | | | | | | | | | | | | | | | Added QQuickWebEngineSingleton and updated the expected API list. Change-Id: If91aadd2353b94732da18734bdfe68fbf3245d53 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Correct demobrowser target on OS XAllan Sandfeld Jensen2015-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | We were still using Browser as target on OS X Change-Id: I0b526ad772651a3a54913e0830fc2f92fe2648c4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Fix QT_NO_ASCII_CAST buildAllan Sandfeld Jensen2015-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Use QStringLiteral for string literals. Change-Id: Ie5c105fac5e23bb323da5e0407874d25154ebe58 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | External URL supportAllan Sandfeld Jensen2015-09-285-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for launching external URLs such as mailto: They are also routed through navigationRequested like they would have been in QtWebKit. [ChangeLog][QtWebEngineCore] External links such as mailto: are now handled. By default they launch using QDesktopServices. Change-Id: I83ed96e2330d54cae57f03648d471a8da9a82a30 Task-number: QTBUG-47143 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | Implement unload dialogsSzabolcs David2015-09-275-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the assertion that occurs when the application should show "Are you sure you want to leave this page?" dialog. We can reuse the already existing confirm dialog implementations. Change-Id: I22466d450f39b54d9becbb69e1ecadb3b98697b0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Signal that no positioning backend is availableKai Koehne2015-09-251-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far we didn't gave any hint that no positioning backend is available. This patch adds a qWarning(), and also signals the JS side that no positioning data is available. While at it, the unused bool return value of start() is removed. Change-Id: I9e3c21a9ea5c6ab94d230507fe7418fb01c7b86c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Add unselect webactionAllan Sandfeld Jensen2015-10-126-0/+22
| | | | | | | | | | | | | | | | | | | | | Adds a web action to clear selection. Change-Id: I203b9fbc7a8f3714695eef043ebc3a8f79c20b75 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Add contentsSize APIAllan Sandfeld Jensen2015-10-1211-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds API to read contentsSize to go with scrollPosition. This property used to be in QWebFrame in QtWebKit. Change-Id: I498075e4c0ad916e5c96dbfb02101ce8a0c298ee Task-number: QTBUG-48323 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Add scrollPosition APIAllan Sandfeld Jensen2015-10-1211-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an API to read the main-frame scrollPosition. In QtWebKit this property used to be in QWebFrame. Task-number: QTBUG-48323 Change-Id: Ic8312afac0dcdcfd8c7fd4589be774d327bb6268 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 21:41:06 +0000