summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cherry-pick security fixes from Chromium 49v5.6.0Allan Sandfeld Jensen2016-03-032-1/+1
| | | | | | | | | Update the Chromium SHA1 to include security fixes cherry-picked from the Chromium 49 release. Change-Id: Ia5ec7311a65bac886ed13f880b79242712e32ab9 Task-number: QTBUG-51636 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Doc: Mention target platform limitationsKai Koehne2016-02-251-0/+13
| | | | | | | | | In particular that Windows XP is not supported. Task-number: QTBUG-49900 Change-Id: Ib487ac6efac81a08c2d6fd20e6768561878d9020 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* OS X: Fix QtWebEngineProcess @rpath handling so macdeployqt works.Alexandru Croitor2016-02-251-16/+2
| | | | | | | | | | | | | | | | | When QtWebengineProcess was built on OSX using frameworks, all linked frameworks were found using @executable_path, except for QtPositioning which still used @rpath, and the run path list did not contain an entry to point to the main app bundle frameworks directory. Make sure all frameworks use @rpath, and also add a run path value pointing to the main app bundle frameworks directory, so all frameworks can be found once deployed with macdeployqt. Change-Id: Ie25f4c15169bd608dd819294901c196a7d794f43 Task-number: QTBUG-50155 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* Doc: fix copy/paste error in the overviewLeena Miettinen2016-02-251-1/+1
| | | | | Change-Id: Id9d633f5a68d563d2266743c5ecd2572f9da89c2 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: Refer to Pepper instead of Adobe Flash PlayerLeena Miettinen2016-02-241-4/+5
| | | | | | | The old version confused a user. Change-Id: I67178d64489a9502a146f386dfce758aa7dd7586 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: Add information about framesLeena Miettinen2016-02-243-24/+48
| | | | | | | | | | | | | | | - Describe differences between Qt WebKit and Qt WebEngine in the porting guide - Replace references to frames with references to the view in the QWebEngineView docs - Describe frames in the QWebEnginePage class overview - Replace references to frames with references to pages where appropriate in the QWebEnginePage docs - Describe the "security origin" concept that is related to frame handling Change-Id: I8c952d507414058759537a6333649c37976c12e6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: Add intro to WebEngineView type docsLeena Miettinen2016-02-241-2/+117
| | | | | | | | | | - Initializing the web engine. - Describe the properties, signals, and methods of the type in the type Description. - Refer to related types and utility types. Change-Id: Ia851732051500498bfebd6d56f38ca1629ac3dfa Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: Improve the overviewLeena Miettinen2016-02-244-15/+84
| | | | | | | | - Add module diagrams and descriptions of main classes - Add initializing Qt WebEngine Change-Id: I29f3e9aadbcc86b09c722d1c63b4a5c2c585d215 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: Move info about WebEngineCertificate methodsLeena Miettinen2016-02-242-11/+15
| | | | | | | | ...from WebEngine type to WebEngineCertificate type introduction. Change-Id: I8e8d7aae3f3cad6647a2a0537d2866c7827aba96 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: Link to Platform Notes from the OverviewLeena Miettinen2016-02-231-0/+4
| | | | | | Task-number: QTBUG-51138 Change-Id: I292b23d450f393fca2dd0a9b12d903309a6000bc Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update ChromiumAllan Sandfeld Jensen2016-02-231-0/+0
| | | | | | | Pulls in recent security fix for same-origin bypass. Change-Id: I50bd658c16af72f14018cb97aa3f32fc1554a7c0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: Add "Namespaces" to the C++ API ref titleLeena Miettinen2016-02-183-3/+3
| | | | | | | | To make it easier to find the documentation for the QtWebEngine namespace. Change-Id: I61cd073f63f2064e256e20c8f675faa69d982cc0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Document Chromium version also in the documentation.Michael Bruning2016-02-181-0/+3
| | | | | | | | The changes files may not be available or obvious for all users. Change-Id: I470e8bf70ebacc34457788f595ca0fa22349e580 Task-number: QTBUG-48098 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Include the module prefix for the header filesv5.6.0-rc1Andy Shaw2016-02-151-3/+3
| | | | | Change-Id: I81545b00dbfc94949dd5d8b2252c2230ca5d2601 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* 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>
* 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
| * | | winrt: Disable buildMaurice Kalinowski2016-02-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WinRT is not a supported platform and checks to disable the build have been removed in previous refactorings. Change-Id: I22d2a8ae28f7cfaa3b962ac353ad5c14f11771a9 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | | Disable WebSpeechAllan Sandfeld Jensen2016-02-014-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also allows us to remove code handling libFLAC and libspeex since we no longer depend on those. Change-Id: Ifedc19b3c958215d298edd11f9126ea5b9cc09fa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | Preserve webchannel and userscripts when restoring historyAllan Sandfeld Jensen2016-01-315-2/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most page-state is set in webcontentsadapter::initialize except user scripts and webchannel. This patch ensures those are initialized too when changing to a new adapter during history restore. Change-Id: I4dca23ddab50480b1a72252a038834ce1802ad77 Task-number: QTBUG-50751 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: David Rosca <nowrep@gmail.com>
| * | | Disable printing in ChromiumAllan Sandfeld Jensen2016-01-316-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling printing saves us compiling those files and files off a megabyte on the debug binary. To keep all the configure options in config, the common options are moved to a shared common.pri. Change-Id: Ieffdf9eb7dca58cfdafadd85bd24ea9c2be55ece Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | | Fix crash on open link in new windowJoerg Bornemann2016-01-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default implementation of QWebEngineView::createWindow returns a null pointer. Add missing null pointer check in adoptNewWindow. Change-Id: Ia6138f372ff169b9d32764b15550939adc247a1c Task-number: QTBUG-50718 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | | Fix crash on exit for view-owned QWebEngineUrlSchemeHandler objectsJoerg Bornemann2016-01-283-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For view-owned URL scheme handlers the destructor would remove the handler and then trigger URLRequestContextGetterQt::generateStorage. This would access the browser context from the IO thread while it already has been destroyed on the browser thread. Increment the ref count for the browser context before every call of generateStorage, and decrement it when generateStorage is finished. Task-number: QTBUG-50160 Change-Id: Id8b1505891ec56e93bf9d47f33bb8bc3304eb55a Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | | Doc: update Contentmanipulation example docsLeena Miettinen2016-01-284-90/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update screenshot - Remove second \brief command - Fix grammar issues - Use standard phrasing for examples - Replace \snippet commands with \quotefromfile commands. This enables documenting each line of code separately - Replace occurrences of QWebView with QWebEngineView - Replace reference to the obsolete QWebEnginePage::evaluateJavaScript method with reference to QWebEnginePage::runJavaScript() that is used in the example code - Remove snippet markers from mainwindow.h and mainwindow.cpp - Move code comment from mainwindow.cpp to the documentation to make the code leaner Change-Id: If3346810c8aef67c15c9ec7ad4469a222e636cf2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | Doc: rendering to OpenGL SurfaceLeena Miettinen2016-01-281-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-50037 Change-Id: I9c7a09824172a09d8b454bf8ff5d358c00ce6b88 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | Fix multi-thread protection in custom url handlerAllan Sandfeld Jensen2016-01-275-96/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The classes were not properly protected against race conditions. To solve this there is now a class shared between the two thread that is not deleted until the classes on both threads have been deleted. Change-Id: I499bd98805ae7a195aca42f30610eb6c2b0fd0f7 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | Fix occasional "WeakPtrs must be checked on the same sequenced thread."Joerg Bornemann2016-01-262-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert 7c7ee9a9, and fix the issue by passing a raw this pointer to startAsync. Bind will take care of calling AddRef/Release for us. Otherwise the WeakPtr would get assigned to the UI thread and must be invalidated in the same. Change-Id: Iee741dde521cf085a086e397a8154fa1384d58d1 Task-number: QTBUG-49670 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | | Add cookiebrowser exampleMichal Klocek2016-01-2612-0/+887
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A cookiebrowser shows collected cookies during browsing, users can view cookie content, delete and add new cookies. Change-Id: Ib9cdc29e7ca34c488dd249b44f9e32491517bd60 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | | Allow build on all Linux platformsKai Koehne2016-01-261-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support also irregular mkspec names like linux-imx6-g++. We officially only support boot2qt for embedded Linux, but that's no reason to prevent builing on other configurations. Also, the line between embedded and Desktop Linux is blurry. Task-number: QTBUG-49249 Task-number: QTBUG-50259 Change-Id: If5b87a21bb226194c8340430be958d42ae80b537 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | Stabilize tst_QQuickWebEngineViewGraphicsJoerg Bornemann2016-01-241-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a race condition where loadVisuallyCommitted was emitted before the QSignalSpy in waitForSignal could be connected. Change-Id: I7fcb9e3b423430405daf99c588ae8b70645333a1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | | 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>
* | Copy all resource files to build directoryKai Koehne2016-01-231-8/+17
| | | | | | | | | | Change-Id: I1a4b96a2a695b4be4e936275c59f939b887098d1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix asserts in touch handlingKai Koehne2016-01-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | Generate touch events with the "causesScrollingIfUncanceled" property set to true. This is checked by TouchEventQueue::TouchMoveSlopSuppressor Task-number: QTBUG-50511 Change-Id: I5260100db75ed7afdd7afeff8f530221c22090b0 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Document OS X 10.9 dependencyKai Koehne2016-01-221-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-48779 Change-Id: Iaf189f69a9c4434a9417d482e63b83d8fc2f58b1 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 17:31:54 +0000