summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add a Qt Designer plugin for QWebEngineView.Friedemann Kleint2016-03-318-1/+224
| | | | | | Task-number: QTBUG-52104 Change-Id: Icf8b4eea7fc52498b2ce9a2c04da6a24e8bdb070 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix Windows build when response files for moc are generatedJoerg Bornemann2016-03-311-0/+3
| | | | | | | | | | | | | | moc.prf contains magic (translation: weird heuristics) to determine if the moc command line would exceed the command line length limit on Windows. If such an excess is detected a response file is created in MOC_DIR. As our build directory is not qmake's default one, moc calls will not find the response file. Set MOC_DIR accordingly to generate the reponse file in the right location. Task-number: QTBUG-51847 Change-Id: Id0695451a986cd9514a7c965c6d33c5c3ef800cd Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix CommandLine initialization on WindowsJoerg Bornemann2016-03-312-7/+20
| | | | | | | | | | | | Chromium insists on getting the command line via the system call GetCommandLineW. QCoreApplication already did that, and we want to pass the already split argument vector to init CommandLine. This way, the user can pass custom arguments to QGuiApplication, and Chromium will pick those up correctly. Task-number: QTBUG-51971 Change-Id: I85b2071fcd8e5781b13ec8d22dc00b1a0c71601b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Blacklist tst_QQuickWebEngineView::transparentWebEngineViewsJoerg Bornemann2016-03-311-0/+2
| | | | | | | | This test is failing on 32 bit Windows. Unfortunately, we couldn't reproduce the failure locally yet. Blacklist the test for now. Change-Id: I7bdbc52033ccc0ed16ccf934418cc56a7783f88b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* OSX: Fix QSurfaceFormat check to allow < 3.2 OpenGL profiles.Alexandru Croitor2016-03-312-8/+18
| | | | | | | | | | | | | | | | | | | Currently if a < 3.2 OpenGL Compatibility profile is requested on OSX, a webengine application would crash saying that the global profile does not match the default profile. That happens because in the Cocoa QPA any requested OpenGL Compatibility profile or Core profile with version smaller than 3.2 gets reset to QSurfaceFormat::NoProfile and version 2.1. Fix consists in making sure that the QSurfaceFormat check only considers Core profile with versions >= 3.2. All other combinations would result in NoProfile 2.1 and thus not cause any issues for webengine. Change-Id: I7c9866d761c052e52389022abe8e213d062db41f Task-number: QTBUG-51058 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Doc: Mark QWebEngineProfile::setRequestInterceptor as new in Qt 5.6Kai Koehne2016-03-311-0/+1
| | | | | Change-Id: I93f68098718d7f0303accabc9def49ff83e65ca2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: Mention which settings properties are new in Qt 5.6Kai Koehne2016-03-311-2/+2
| | | | | Change-Id: Ic99ce79856fdc9a528b78f518c27013579bf38cf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Fix QtWebEngineProcess not being found after macdeployqt is used.Alexandru Croitor2016-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Currently on OSX, two Info.plist files are generated and copied to the QtWebEngineCore framework, one into Contents/Info.plist and another into Resources/Info.plist. The first one is generated by core_headers.pro and the second by core_module.pro. OS X frameworks only use the plist found in the Resources directory, and the Contents one was generated by qmake erroneously, assuming that core_headers is an application, rather than a framework. When macdeployqt is used with -always-overwrite option, it copies Contents/Info.plist (which contained an incorrect bundle id) over to Resources/Info.plist, and afterwards when an application is executed, it cannot find the plist file because it contains the the wrong CFBundleIdentifier, thus not being able to find the QtWebEngineProcess. Fix consists in making sure code_headers.pro does not generate an Info.plist, and just use the one generated by core_module.pro. Change-Id: I6295bde3b1d1771ed45f3a2fdff9fc60577f2ab6 Task-number: QTBUG-51939 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Purge sRGB chunks from PNGs in test.Edward Welbourne2016-03-301-0/+0
| | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I0fe8ea5a1c89d5c9c0dce765607e55ae9e9cf9fd Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: Fix documentation about cookie storesKai Koehne2016-03-294-3/+8
| | | | | | | | | | | | | Remove misleading "singleton, if one has been set" from the accessor's documentation. Also link to the accessor's from the class documentation, and remove mentioning of cookie store as something that can be accessed for an individual page. Finally, mark QWebEngineProfile::cookieStore as new in Qt 5.6. Change-Id: Ia20ca0ef45a9a15de0052f7ceb7f59d454c70fdc Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Move loadVisuallyCommitted signal to the test support APISzabolcs David2016-03-256-5/+30
| | | | | Change-Id: I877bbd8bc5c710370f135a27bcd7f0f7c95a7292 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: Restructure paragraph about loading pagesLeena Miettinen2016-03-241-3/+2
| | | | | | | | Describe the "loading" property first and remove the "LoadStatus" enumeration. Change-Id: I2357c604197c305e9cd2d3ff7dd322949b1b9e4b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Use qt_app -> relative_qt_rpath for QtWebEngineProcess.Alexandru Croitor2016-03-241-15/+12
| | | | | | | | | | Use CONFIG+=relative_qt_rpath to make sure the web engine process contains a relative rpath instead of an absolute path rpath value. Change-Id: I5f3c9fb93273c41bed795aeba112f260382d2bf8 Task-number: QTBUG-50155 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Stop using QT_PRIVATE for QtWebEngineProcess in a non-framework build.Alexandru Croitor2016-03-241-4/+2
| | | | | | | For executables, QT and QT_PRIVATE are the same. Change-Id: I8f8ef29aea6f4ebb3d7b6cd2f3bc6a3cbf83b0e4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix crash when link opens a modal QDialog, using the trackpad.Alexandru Croitor2016-03-242-8/+48
| | | | | | | | | | | | | | | | | | | When a QWebEngine link is clicked on, and as a result a modal dialog is opened, a QEvent::TouchCancel without any touch points is forwarded to Chromium, which tries to access the first touch point position, and causes a QList assertion. Fix consists of two parts: 1) Make sure that no TouchCancel is forwarded, in case if no TouchBegin or TouchUpdate was issued beforehand. 2) Because QEvent::TouchCancel events might contain an empty touch point list, and Chromium expects at least one point, make sure to forward the last saved touch points (saved in previous TouchUpdate) together with the TouchCancel. Task-number: QTBUG-48661 Change-Id: I1eeb2980417b1b04e8387dc9f82f935ef2bd8f00 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: Improve docs for the zoomFactor propertyLeena Miettinen2016-03-233-4/+8
| | | | | | | | In the WebEngineView type and QWebEnginePage and QWebEngineView docs. Change-Id: Ibbabcf6cc38a48fb14abb105f5fda4c03a89ccba Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: Quote example code from the Minimal exampleLeena Miettinen2016-03-232-58/+12
| | | | | Change-Id: I0050a0090e4e0877dc56b8c529d9cbb77a0cdd33 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Set CFBundleIdentifier for QtWebEngineProcess to a proper value.Alexandru Croitor2016-03-211-1/+1
| | | | | | | | | | | | When QtWebEngineProcess bundle is created, the generated Info.plist CFBundleIdentifier contains the default dummy prefix added by qmake, namely: "com.yourcompany.QtWebEngineProcess". Make sure it uses the proper "org.qt-project.Qt" prefix. Change-Id: I8e060aeeeb8a53980139e790d3e3947752ffa1d3 Task-number: QTBUG-51942 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Doc: Attribute, not flag, can be used for initializationLeena Miettinen2016-03-211-2/+3
| | | | | | | | | The Qt::AA_ShareOpenGLContexts attribute can be used to set up an OpenGL Context, instead of passing it in the constructor. Task-number: QTBUG-51379 Change-Id: I46bcb07fc69c0b8e7ac9bf632d328c15dca2ea45 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-03-2117-79/+298
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Icbe7ea849b6ccdcee1ea1beccf86309ffb1ed578
| * 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>
* | Make MarkDownEditor example more usableKai Koehne2016-03-183-10/+20
| | | | | | | | | | | | | | | | - Use a fixed width font for the editor. - Accept .md file as command line argument. Change-Id: I97e3bb930569240e195ecc21ed4ce3d9acd3ff66 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Remove tst_QWebEnginePage::viewModesJoerg Bornemann2016-03-171-21/+0
| | | | | | | | | | | | | | This tested semi-public API. History points to a WRT-related feature. Change-Id: I974feec55c5b243701bb2fa481ca16273088e438 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Strip down demobrowser to become simplebrowserMichal Klocek2016-03-1633-1/+3441
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Demobrowser changes: * remove QLocalServer/Socket * remove AutoSaver * remove restoreLastSession * remove general QSettings * remove downloadManager * remove bookmarkManager * remove historyManager * remove searchBar * favor setStyleSheet over overriding paint methods * use lambdas where suitable * use QProgressBar instead of own painted widget * use QToolButton instead of own painted buttons * remove QStackWidget, use single UrlLineEdit per window instead of per tab * split files to keep own classes: webpage and webview * remove tracking windows by QPoiner * remove WebPageActionMapper, TabBar classes * remove QDrag dead code * remove special OS X close app handling * fix encapsulation, clean up application logic Change-Id: I4849b6a2de739dea4f01229abdb90418601a2397 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
* | Doc: Mark renderProcessTerminated signal as new in 5.6Kai Koehne2016-03-112-0/+3
| | | | | | | | | | | | Change-Id: I54a9514451c04918faf55516881c9ca720d56dc5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Disable installation of icudt.dat for builds using system ICUKai Koehne2016-03-101-9/+16
| | | | | | | | | | Change-Id: I71006b596b985acbfeec883d63de67959d0b8bdb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Initialize lazy base::CPU when IO are allowedIlia Kirianovskii2016-03-101-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should initialize base::CPU to get it a chance to read /proc/cpuinfo when IO operations are allowed. So it prevents the following error on ARM platform: ``` [0204/071425:FATAL:thread_restrictions.cc(38)] Function marked as IO-only was called from a thread that disallows IO! If this thread really should be allowed to make IO calls, adjust the call to base::ThreadRestrictions::SetIOAllowed() in this thread's startup. ``` In the same manner it is done in ChromeMainDelegate::PreSandboxStartup. Change-Id: I1facd9d856a8dbfdf03ddbb1ab8d76d2efe69050 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Flash: document --ppapi-flash-version argumentKai Koehne2016-03-101-0/+8
| | | | | | | | | | | | Change-Id: I9260a5cc4b5e027a46fc22752c1dca62484dd595 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Flash: Support --ppapi-flash-version argument also for system FlashKai Koehne2016-03-101-1/+2
| | | | | | | | | | | | | | Task-number: QTBUG-51774 Change-Id: I609cfbd9304a396ab57c1479c7f4d3be8a379b94 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Check for presence of the qtwebengine-chromium submoduleJoerg Bornemann2016-03-091-0/+3
| | | | | | | | | | | | | | | | | | People repeatedly tried to build QtWebEngine without checking out the qtwebengine-chromium submodule. Let's yield a helpful error message if the submodule isn't present. Change-Id: I9bf607e7a21e6e79c83bcd4afc81c63ae83e1ed6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Mark qtwebengine as warning_cleanKai Koehne2016-03-091-0/+1
| | | | | | | | | | Change-Id: Idb378399db4136ae69a49c71d92b9e09afddc260 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Remove test for QWebEnginePage::metaDataJoerg Bornemann2016-03-081-42/+0
| | | | | | | | | | | | | | This API doesn't exist. Meta data can be read by evaluating JavaScript. Change-Id: I6089de34b463d34d94d4d05e723e12bc163d288d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Blacklist test_geoPermissionRequest on Windows as well.Michael Bruning2016-03-071-0/+1
| | | | | | | | | | Change-Id: I94aa72517dfedc22d9100b85e4d66dbf67bb3207 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Remove skipped test tst_QWebEnginePage::popupFocusJoerg Bornemann2016-03-071-46/+0
| | | | | | | | | | | | | | | | This test makes only sense in QtWebKit where HTML input elements are implemented with Qt widgets (e.g. QComboBox). Change-Id: I0fdd63530db762595df7ca370ff2f9b1d73cc0a8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Remove test for unimplemented Web SQL Database APIJoerg Bornemann2016-03-071-59/+0
| | | | | | | | | | | | | | | | | | | | QWebEngine will not provide a wrapper API for the now deprecated Web SQL Database HTML5 API. Change-Id: I8864b202ce9200145953ba5273f86eddff9e133a Task-number: QTBUG-51346 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Doc: Building with macx-clang-32 not supportedLeena Miettinen2016-03-071-0/+3
| | | | | | | | | | | | | | Task-number: QTBUG-51139 Change-Id: I0597651b9722e0a62f2c569980f183dd2df00221 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Doc: fix links in the minimal example docsLeena Miettinen2016-03-072-4/+4
| | | | | | | | | | | | | | | | ...to use the external link specified in qtbase\doc\global\externalsites\qt-webpages.qdoc Change-Id: Ieeade45440a5454ec7856230510f3914b1a56800 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 19:44:03 +0000