summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge dev into 5.7Oswald Buddenhagen2016-02-173-24/+20
| |\ \ | | | | | | | | | | | | Change-Id: I43d4811120b551ae9c2619dedb2099b7e7796660
| | * | Fix iconUrl getter and changed signalAllan Sandfeld Jensen2016-02-123-24/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should only emit iconUrlChanged when iconUrl changes, and the return value of iconUrl should match the value of the last emitted change. Change-Id: I70f4d6a11b96d83278dddc4d85e1c78ca82bf5cb Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | | | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Allan Sandfeld Jensen2016-02-2313-26/+161
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-02-2013-26/+161
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| Change-Id: If884b8b8bc087a6a726476b49cdb48a0efaa173e
| | * | Bump versionOswald Buddenhagen2016-02-171-1/+1
| | | | | | | | | | | | | | | | Change-Id: Idf342287876a876ae33807ff05eb218ce483f15a
| | * | Update Chromium SHA-1.Michael Bruning2016-02-161-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes a fix for building with ICU 54 Change-Id: I634a4424e3f0e5f1d9c2451f9b92d52d22658f45 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Michael Brüning2016-02-160-0/+0
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-02-150-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: I6897c50a0cd86dd0989663151d18bacfca91192b
| | | | * | Update Chromium5.5Allan Sandfeld Jensen2016-02-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the chromium branch pulling in backported fixes from the 45-based branch. Change-Id: I6d9be02954f4e46690fdb2808979d1b0ec4bae8c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * | | | Include blink image resourcesAllan Sandfeld Jensen2016-02-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium now places the icons used by blink in a different resource that we need to include. Change-Id: I0af79c1888482b23716fa634efdb38ed2114ec1b Task-number: QTBUG-50671 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * | | | Doc: State equivalent of setHtml more preciselyJoerg Bornemann2016-02-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling setContent with mimeType "text/html" does not use UTF-8 encoding. The character set must be specified. Change-Id: I67e3273afd0503b333e718e4706852d911fed2e4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * | | | Fix doubled characters when using IME on WindowsJoerg Bornemann2016-02-162-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, when exiting the IME by pressing a cursor key or clicking into the edit field, we do not receive an QInputMethodEvent with a commitText. Instead, we get an empty QInputMethodEvent and a key{Press|Release}Event pair with a key of zero. The committed text is in the event's text property. Do not call ImeConfirmComposition for the empty QInputMethodEvent but for the later keyReleaseEvent. Do not forward those key events. Change-Id: I844aa05493aca4c388a8b1de835baf2a819558f5 Task-number: QTBUG-50252 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * | | | Fix removal of left-over local socket in demobrowserJoerg Bornemann2016-02-161-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QLocalServer::removeServer instead of QFile::remove. The socket is usually not in the current directory. Change-Id: Ie5b20b8b02ec7f3065596ebd945a6639bb65a2c0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | | | Do slow copy of mailbox textures when contexts are not sharedMichal Klocek2016-02-161-6/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of two individual screens on X11 qt global shared context is not shared. Copy the textures between contexts using FBO and system memory. Task-number: QTBUG-48969 Change-Id: I07d9d5e27917fd63064215b4eb1d0b134065bd43 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | | | Enable Viewport Meta support for Embedded platformOtavio Salvador2016-02-161-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Viewport Meta is enabled in Android so we ought to do the same for Qt's embedded platform. Task-number: QTBUG-50903 Change-Id: I0d5aab42e740cc00eb2d9111953577019211bf11 Reviewed-by: Otavio Salvador <otavio@ossystems.com.br> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | | Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-152-3/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I74e27960437e76876b9ed214db18e77e9e82408c
| | | * | | Fix rendering with default OpenGL surface on LinuxJoerg Bornemann2016-02-121-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 32929885 led to rendering blank pages in QWebEngineView. Set the OpenGL version only if the core profile is requested. Change-Id: Ie05c7804afbce26aee63455e27c23219484f535d Task-number: QTBUG-51032 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * | | Update Chromium SHAAllan Sandfeld Jensen2016-02-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in latest security fix from Chrome 48.0.2564.109 Change-Id: Ib21c27217d3b6108bf8cdbf414f31e523ccc373a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | | * | | Update Chromium SHA-1 to include navigation type fix.Michael Bruning2016-02-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6010404545efea5b40302c313e526ae1efd95d74 Task-number: QTBUG-50672 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | | | Fix WebAction muteAllan Sandfeld Jensen2016-02-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebAction mute was not working since it was setting its current state instead of the toggling mute. Change-Id: I9572c77e084e11b00f645845764fe13e0a603664 Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | | | Fix double LoadFinished on URL errorsAllan Sandfeld Jensen2016-02-105-7/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RenderFrameDeleted was called before DidFinishLoad, which meant m_loadingErrorFrameList was empty and wouldn't detect the page loaded was an error page. Instead this patch relies on the chromium error-page url which we already asserted. Additonally we delay emitting the loadFinished signal until the error page is also done loading, since the error-page can be considered part of the load, and we otherwise have a race condition on toPlainText. Finally we were not getting error-pages when blocking requests because we reported them as aborted them instead of blocked. Change-Id: I945eb838b7f080d4e146f18354e8986e1b88b5cd Task-number: QTBUG-50752 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | | | Doc: Fix invalid character in the OverviewLeena Miettinen2016-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-51136 Change-Id: I647ea47714df2f33d0cdf448e0478fa0566aed83 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | | | | Require xcode 7.0 and OS X 10.10Allan Sandfeld Jensen2016-02-221-5/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We might be able to get xcode 6.0 on OS X 10.9 working with an 10.10.3 SDK, but for now we just require 10.10 and a newer xcode. Change-Id: Ibeb068e9993b3709a1fd74370d7892718a108ab1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | | | Reduce size of embedded binariesAllan Sandfeld Jensen2016-02-163-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a WEBENGINE_CONFIG option that greatly reduces the size of the core library (from 80Mbyte to 45Mbyte on Linux), and enable it on embedded linux by default. Change-Id: Ieb7afdbc160984fe5952be16dfbc96aa8c5f35ef Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | | | Add rudimentary printing API and add it to example.Michael Bruning2016-02-1615-8/+449
| |_|_|/ |/| | | | | | | | | | | | | | | Change-Id: I48141d07e9744bb21d64a5c8724579cb469ba35c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | | Rename UserScriptController/Host to UserResourceController/HostSzabolcs David2016-02-1020-126/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These classes can operate user stylesheets too. Change-Id: Ia283af92e52a822b26003ff65e0e7dc391b0904d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | | Added background tab support to WidgetsAdam Kallai2016-02-104-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added middle click navigation support to DemoBrowser. - Extended WebAction with new case (open a new tab in background). - Updated WebEngineWidgets documentation. Change-Id: I4ff91806c274a74f4d94b3f5d43fdd99ab900d46 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | | Doc: add docs for new QWebEnginePage::runJavaScript() variantsLeena Miettinen2016-02-101-13/+51
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib84434c86c8003024fd22c2891413afbad33941e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | | Include printing sources and enable printing for desktop platforms.Michael Bruning2016-02-1018-3/+1673
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds Qt specific core classes for printing as well as adding printing related objects to the web engine context and including the printing sources in the builds for the desktop platforms. Also updates src/3rdparty submodule SHA-1. Change-Id: I9c2631c59f63571c0840d838077e66122bacc741 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-1025-28/+417
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp tests/auto/widgets/widgets.pro Change-Id: Id9444359ed2e35d469331db96a355c9ea2d095d5
| * | | Merge remote-tracking branch 'origin/5.6.0' into 5.6Allan Sandfeld Jensen2016-02-0825-27/+416
| |\| | | | | | | | | | | | | | Change-Id: I98705a1bb82917147f36a89761eedfc755a45bc5
| | * | Stabilize failed load sub-test of urlSchemeHandlerAllan Sandfeld Jensen2016-02-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a failed load is replaced by an error-page we currently get two loadFinished signals. So disable error-pages to make the test of failed load simpler. Change-Id: I3baaf0f5a06c5e755695d6540316287a860e0d5f Task-number: QTBUG-50752 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * | OS X: Fix crash when setting a custom default QSurfaceFormat.Alexandru Croitor2016-02-0411-0/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting a new default QSurfaceFormat after QtWebEngineCore::initialize() is called, might lead to a crash. This happens when the new surface format has a different OpenGL profile, compared to the profile created by web engine in the RenderWidgetHostViewQtDelegateWidget constructor. The default constructed QSurfaceFormat has an OpenGL Compatibility profile. Inside the Cocoa platform plugin when a new shared OpenGL context is created, it fails to initialize the new context because of the difference in profiles, and thus ultimately creates an unshared context, which leads to a crash. Fix consists in using the shared context QSurfaceFormat in the RenderWidgetHostViewQtDelegateWidget constructor, and also printing a fatal warning to notify the developer only to set the new QSurfaceFormat before the application instance is declared. Bottom line, if the QSurfaceFormat OpenGL profile has to be changed, it should be done before QtWebEngineCore::initialize() is called. Doing so after initialize() is called, will lead to a crash. Change-Id: I8a07211b592143d736b001556b944d4759802396 Task-number: QTBUG-50665 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
| | * | Doc: QWebEngineSettings::WebAttribute values provide no safety mechanismsLeena Miettinen2016-02-041-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-45556 Change-Id: Ifc39eba7f9e9324f180feeb0d99fef1434f97d64 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Prefix Markdown Editor example with "WebEngine"Kai Koehne2016-02-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the example of the other examples, and always start with WebEngine. This makes also sure that Qt Creator attaches the 'webengine' tag to the example. Task-number: QTBUG-50582 Change-Id: If99ba9a23560abae61e4e2ef5a5b091b3c5473c2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| | * | Stabilize tst_QWebEngineProfile::urlSchemeHandlers some moreJoerg Bornemann2016-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work around QTBUG-50752 in URL scheme handler test. Triggering the failing load makes subsequent calls to toPlainTextSync unreliable. Change-Id: I370d59b935b186fa4e3be3097ee921802f951720 Task-number: QTBUG-50752 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Stabilize tst_QWebEngineProfile::urlSchemeHandlersJoerg Bornemann2016-02-041-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the emission of loadFinished wasn't caught. Use a QTRY_VERIFY-like function to synchronously load a page. Change-Id: Ib260a126c0cff7f254c97b1cd89f49b806010235 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * | Use fictional schemes in URL scheme handler testJoerg Bornemann2016-02-041-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid the usage of mailto. It might get forwarded to QDesktopServices. Change-Id: I2e8c889e8b0107b11c22c182a64685bc5ac16aae Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * | Mark highlighted examplesKai Koehne2016-02-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far this has been done centrally in qtbase, but having the list in the modules actually makes maintaining them easier. Change-Id: I8bfab036cd86dea30e5b8ae8cf3993c458a20e9c Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * | Fix QDoc warning for QWebEngineUrlRequestInterceptor.Michael Bruning2016-02-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Explains the info parameters internal change tracking. Change-Id: I19c8f96d8ecd0b2dc8a56d3d01cc91dd2b664abd Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| | * | Add SUBDIRS in correct orderSamuli Piippo2016-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To workaround qmake issue, the SUBDIRS need to be in correct order. Otherwise recursive qmake call will fail with: Project ERROR: Unknown module(s) in QT_PRIVATE: webenginecoreheaders-private Task-number: QTBUG-45706 Change-Id: I0f70b468fa306406036c0425fc7ae7e7a4f0cfc7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6.0" into ↵Jani Heikkinen2016-02-042-2/+68
| | |\ \ | | | | | | | | | | | | | | | refs/staging/5.6.0
| | | * | Merge remote-tracking branch 'origin/5.5' into 5.6.0Liang Qi2016-02-012-2/+68
| | | |\| | | | | | | | | | | | | | | | Change-Id: Ic2e3312f316dbe042e2103d3f19fde639faa2707
| | | | * Doc: add documentation for the WebEngineScript itemLeena Miettinen2016-01-202-2/+68
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice1b0a403686b4a280b2709a79fe2ed18ace3ab6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | | Fix build against Qt 5.5Allan Sandfeld Jensen2016-02-044-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make QtWebEngine 5.6 buildable as an upgrade to Qt 5.5 Change-Id: Ic5de7fc414374d8492434dd5b956cbb90fff2e3e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * | | Merge 5.6 into 5.6.0Oswald Buddenhagen2016-02-0240-221/+1334
| | |\ \ \ | | |/ / / | |/| | | | | | | | Change-Id: Ifca953bf6fa663b81dba77a4e825d3917c8e33fc
| | * | | Doc: add a dependency to qtwebview for linking to the moduleLeena Miettinen2016-02-011-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtwebview should be listed as a value of the depends option in the qtwebengine.qdocconf file. It was probably removed by mistake. Change-Id: I86418673b5b8ef01696f8a73bbcf808877e51690 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * | Update chromium submoduleAllan Sandfeld Jensen2016-01-281-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in patch to not build an internal copy of ANGLE. Change-Id: I9f4007ae69d29905fea4b1d94345c38ccf10dbce Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | Optimize FaviconManager related iterationsPeter Varga2016-02-093-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace foreach with for - Fix expensive iteration over QMap::keys() and QMap::values() Change-Id: Ia7f6803af7f5e609ec57bc4115bec17f43668937 Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | Doc: change comment notation to suppress QDoc warningsLeena Miettinen2016-02-051-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc fails to parse the token /* REVISION 2 */ in property declarations, but ignores // FIXME: Change-Id: I0811579a4e33db5f3c90ccc421b6bb7f63605304 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 05:22:03 +0000