summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* macOS GN integrationAlexandru Croitor2017-01-2710-82/+163
| | | | | Change-Id: I89850d43c8f11ec54b3a47318ef0b3f083ae3dee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Make QQuickWebEngineScript a publicly exported classSzabolcs David2017-01-269-181/+285
| | | | | | | | | Now the users can create user scripts when they are working with QQuickWebEngineProfiles in C++. Change-Id: I6ada78b1fc44c3f93589eb468578c330a1be9c6f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Add profile-wide user scripts to the Quick APISzabolcs David2017-01-266-0/+118
| | | | | | | | Add API tests in order to try how it works in C++ and QML. Task-number: QTBUG-51034 Change-Id: I1680297e2dafba39dbd4b161f0dbdb14fb6d4243 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* GN configuration cleanup and preparationAllan Sandfeld Jensen2017-01-263-14/+49
| | | | | | | | Reintroduces the shared linux.pri configuration and moves configuration shared by all architectures to common.pri Change-Id: Iff4d1e6e3d98280223cce0c2c0b74d71ef99df5f Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/devLiang Qi2017-01-2517-149/+222
|\
| * Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-2517-149/+222
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp Change-Id: I070173576fc4be53689ce0dd9e1fd4133f5814da
| | * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2017-01-250-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I01caf95f3df569556e8ed84f3164b0e4e4d9c128
| | | * Merge remote-tracking branch 'origin/5.7.1' into 5.75.7Liang Qi2017-01-161-2/+3
| | | |\ | | | | | | | | | | | | | | | Change-Id: Iec696e265a70a2aed6e58908e8048a126fa77515
| | * | | Fix handling of empty input method eventsPeter Varga2017-01-223-15/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-55766 Change-Id: I4e6ade8f000f66ff1bb28f3b856ae140834292f1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | | Fixing webengine spell checker exampleIonut Alexandrescu2017-01-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The languages submenu was not working corectly, languages could not be checked Change-Id: I7221d3527dbd6e071eb8d1585fb6d90812c61f94 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * | | Make input method hints available via RWHV delegate widgetPeter Varga2017-01-208-29/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moreover, set ImHiddenText hint for password fields and add back the corresponding widget auto test. Task-number: QTBUG-55766 Change-Id: I3f76e19c8c33e11f3d9f515b6dc7d6e998c3c9a4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | | Add back SIP (Software Input Panel) widget testPeter Varga2017-01-185-79/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moreover, update the Chromium SHA1 for enabling virtual keyboard support for macOS. Task-number: QTBUG-55766 Change-Id: Ic50ae79ab13a62a4b9289afedce2d6647e266f86 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | | Doc: Clarify limitations of QNetworkProxyKai Koehne2017-01-181-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-58121 Change-Id: I3f7d960d5fabefe219a89cc5fa4752ead965ab0a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | * | | Disable Q_ASSERTs for a release buildKai Koehne2017-01-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt WebEngine uses the core_gyp_generator.pro and the gyp_generator.prf files to extract defines set by Qt. Anyhow, only one core_generated.gyp file is written for debug and release builds, which hence misses the QT_NO_DEBUG define specific to debug builds. Work around this by explicitly adding back the define. Task-number: QTBUG-58103 Change-Id: I8684aa08417efc93878d70817211e9f66623c78c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | | Fix conversion from blink::WebDragOperation to Qt::DropActionJoerg Bornemann2017-01-184-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blink::WebDragOperation is a bit field, even if it is not used in its blink::WebDragOperationsMask incarnation. In particular, WebDragOperationGeneric can be set in addition to other operations. This fixes situations where UpdateDragCursor is called with multiple bits set in its WebDragOperationArgument and the drag action will be spuriously ignored. Also directly pass the WebDragOperation we get from UpdateDragCursor to chromium's API without converting to QDropAction and then converting it back. Task-number: QTBUG-58037 Change-Id: I5c85699de534771f84db69abf7b98e779872a0f7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | | Do not autodetect system gn and hide option in summaryAllan Sandfeld Jensen2017-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will need a custom gn to build qtwebengine, so we shouldn't use the system gn unless explicitly requested, and we shouldn't advertise using it to users as it usually won't work. Change-Id: I98271ec70841d1b78ff5a1099575872646af73b2 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | | | Add gn build of qtwebengine for linuxMichal Klocek2017-01-2513-134/+521
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit uses gn instead of gyp to build on desktop linux. Use WEBENGINE_CONFIG+=use_gn to use gn during the build instead of gyp. Change-Id: Ifd3d8d0835b47c323a8d39c320eb55e5e1024dee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | Merge remote-tracking branch 'origin/5.8' into devAllan Sandfeld Jensen2017-01-1822-94/+223
|\| | | | | | | | | | | | | | | Change-Id: If16bfc6f0fbfd0040e13a8a3cbaa113fda10f387
| * | | QWebEngineDownloadItem::path() should not be percentage encodedAllan Sandfeld Jensen2017-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the name of the download item is derived from the URL, we currently end up reporting a partially percentage encoded name. This is problematic if our users try to undo the the percentage encoding and opens them out to download-folder escaping files that can install hooks in the user's home directory. [ChangeLog][DownloadItem] (QWebEngine)DownloadItem::path() was previously incorrectly returning percentage encoded file-names when the suggested path was based on URL. This has been corrected. Note percentage decoding the path generally before is not just incorrect when the path is not based on URL, but also dangerous as it can lead to downloads that escape the download folder. Task-number: QTBUG-58155 Change-Id: Ie23a4ff5d4e4c353df72e617bb2b00e1935cd6c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | | Merge "Merge remote-tracking branch 'origin/5.8.0' into 5.8" into ↵Liang Qi2017-01-167-35/+117
| |\ \ \ | | | | | | | | | | | | | | | refs/staging/5.8
| | * \ \ Merge remote-tracking branch 'origin/5.8.0' into 5.8Allan Sandfeld Jensen2017-01-167-35/+117
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I6b16bee2d0034865270fb26a5ad93da05b9129fa
| | | * | | Update Chromiumv5.8.0Kai Koehne2017-01-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15d257f Fix aggregated WebKit license Task-number: QTBUG-57872 Change-Id: I43e8712feb02ea6f3ae77cca4a1cb19d703119c3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | | Update ChromiumMichael Brüning2017-01-022-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include compilation fix introduced on the 5.8 branch. Change-Id: Ia665ddb80374bfc532ad8e90be6b59aab48b5485 Task-number: QTBUG-57774 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | | Doc: Describe WebEngineLoadRequest::errorDomainLeena Miettinen2016-12-222-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the WebEngineLoadRequest property doc from WebEngineView::loadingChanged() method docs and add the type name to create an automatic link to the type docs. Fix a typo in the copied ErrorDomain docs. Change-Id: I9798e066d599c75a062bb7f596e4465f32d613b4 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | | * | | Doc: Fix article in WebEngineSettings::accelerated2dCanvasEnabled docsLeena Miettinen2016-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a > an Change-Id: I52cb0b4b7e654d49e864e16fa5270515a73defbe Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | * | | Doc: Fix QML type name in QML signal signatureLeena Miettinen2016-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1cfa958c02d40f6ac1ec4d3922457d841abc5ea3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | * | | Doc: Describe the WebEngineView::navigationRequested() signalLeena Miettinen2016-12-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I78fc7ecd3e453da16e1e2c493ac4b697e4ab5bcc Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | * | | Doc: Describe default values for WebEngineView::printToPdf()Leena Miettinen2016-12-221-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The doc does not mention that two out of three parameters have default values and can be left out. Also fix the method signature to use QML conventions. Change-Id: I4c88653ce1fc5890aadce74be878098d16ae274c Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | | * | | Doc: WebEngineView::runJavaScript() callback parameter is optionalLeena Miettinen2016-12-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is currently implied, but not stated. Use the \a command for the callback parameter. Change-Id: I4d593f19362e04f54ae555c75897c50d03c643f7 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | * | | Doc: Remove return value from qmlsignalKai Koehne2016-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id354b217a1e584c1f1766953cdfc5fc56435daa8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | * | | Doc: Describe the WebEngineView.LoadStoppedStatus enum valueLeena Miettinen2016-12-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-57636 Change-Id: I71aabeb670385037d938ecf130320e2aa8828331 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | * | | Doc: Fix type name to build FormValidationMessageRequest::type docsLeena Miettinen2016-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I518cd1af6a6952c5ed325b51fbf34e312d90f594 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | * | | Doc: Describe WebEngineDownloadItem.DownloadCancelled enum valueLeena Miettinen2016-12-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I829cd3225858be5c10b00ee5b9c586abb6431111 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | * | | Doc: Add docs for the WebEngineNavigationRequest typeLeena Miettinen2016-12-221-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41d0d286f25aa28b859271d907f226f5740524e0 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | * | | Doc: Describe missing WebEngineFullScreenRequest property and methodLeena Miettinen2016-12-221-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The origin property and reject() method were not documented. Remove \since commands, because all the properties and methods were added when the type was added. Change-Id: Ic63e20fca6469b06b65af78963a968df7a236e0d Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | * | | Doc: Fix property name JavaScriptDialogRequest::defaultTextLeena Miettinen2016-12-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type value was also wrong (should have been DialogTypePrompt), so the text was changed to use natural language insted of code. Change-Id: I5e27749af54a20e722fcd0ccf793cd948151112a Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | | | | Unskip tst_QWebEnginePage::setHtmlWithStylesheetResourceSzabolcs David2017-01-151-20/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-51572 Change-Id: Ie8e7e5ef38f88ae91d892b703cd9702b2637daa2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | | Fix font load error messages inside non-app-bundle testsAlexandru Croitor2017-01-105-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some fonts were failing to load in tests because macOS does not consider some font paths when an application is built without an Info.plist file (as is the case for a non-bundle application). It is possible though to embed a plist file into the executable by passing the path to the file as a linker argument. This change generates an Info.plist for each test, and embeds it into the final executable, thus fixing the font problems. Task-number: QTBUG-57354 Change-Id: I4c3c29442b9d308ee6a327645054a67c4b008ef8 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * | | | Doc: corrected reference to \macosNico Vertriest2017-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtwebengine-deploying.qdoc:28: warning: Can't link to 'Deploying Applications on OS X' Change-Id: I5a00ccbd6695c7b7a79446463b8293f916a0987e Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * | | | Avoid overriding new and deleteAllan Sandfeld Jensen2017-01-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a minimum this produces valgrind warnings of mismatched new and delete. No runtime issues have been observed outside of valgrind though. Change-Id: I5ebb6b380f25f117434633e55dd7fdf04260f0bc Reviewed-by: David Faure <david.faure@kdab.com>
| * | | | Add .pro files for example subdirectoriesTopi Reinio2017-01-053-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of adding individual example projects into SUBDIRS from the top-level examples.pro, add a .pro file for both /examples/webengine and /examples/webenginewidgets that handles them. This way, it's easier to e.g. build all webengine examples from binary packages, as the top-level examples.pro is not packaged. Task-number: QTBUG-57124 Change-Id: I8cf8ac7b13b86306b31bc43c79e3d8272193b1d3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | | Replace ASSERT in FaviconManager::setIcon by returnViktor Engelmann2017-01-051-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ASSERT in FaviconManager::setIcon can be triggered by what seems to be a race condition. Apparently the old request can be gone (so m_inProgressRequests.contains(id) is false), but m_inProgressRequests can still be non-empty, because of a new request to the same URL, so this case is not covered by checking m_inProgressRequests.isEmpty() before. Task-number: QTBUG-57900 Change-Id: I2f26c05e5c97e4bd8d1cea03e8005cf61f2b0c98 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * | | | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I1d97b38e93d0d11bc4e4c375ea7be075341872fd
| * | | | Check RWHV for NULL before dereferencing itViktor Engelmann2017-01-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under exotic circumstances, the RenderWidgetHostView pointer returned by m_webContents->GetRenderWidgetHostView() can be NULL. Therefore, it must be tested for NULL, before its SetBackgroundColor method is called. Task-number: QTBUG-57826 Change-Id: I30e0d2174e80d7971f4e2b6f315a771dc1577814 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | | Prevent accessing d when view closed during DnD operationViktor Engelmann2017-01-021-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a WebEngineView is closed while a Drag-n-Drop operation is in progress, the this pointer and its d-pointer become invalid, so the accesses after drag->exec must be prevented from being executed. To achieve this, a lambda function is connected to dragSources &QObject::destroyed signal, which invalidates a bool on the stack (and cancels the Drag-n-Drop operation). Task-number: QTBUG-57713 Change-Id: I9cbb5e6aba99e307d62773bc18f4fec5f79cf703 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | | | Enable viewport-meta setting againAllan Sandfeld Jensen2016-12-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We enabled this using a command-line argument in 5.6, but that argument is no longer available in 5.7, so instead set it to match viewport enabled. Task-number: QTBUG-57206 Change-Id: Ibef9e93bc96f74429870fdb340d6ea0c0030159c Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
* | | | | Update chromiumMichal Klocek2017-01-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a47c04a [Backport] Defang the CT Timebomb 15d257f Fix aggregated WebKit license b41aa16 Fix building with use_gio=false 128e6f6 FIXUP: Fix dependencies on ANGLE 662a4a1 Fix false dependency on mus, tracing and mojo_runner 5cf4c44 Fix macOS build when plugins are disabled 965b67f Enable virtual keyboard on Qt supported platforms d6c9e61 Add support for creating pri link information 0fa2e06 Fix convert dict tool build Change-Id: I71b118b5976963a9dd0fdd768a1bf878ecb4b7f5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | | Add pepper-plugins feature to new configure systemMichal Klocek2017-01-168-17/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-57731 Task-number: QTBUG-58108 Change-Id: I253dab52361afd411dcf545fab752836c19ee3c7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | | Add print and pdf feature to new configure systemMichal Klocek2017-01-1619-57/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently printing and pdf are bounded together. Make compilation optional by adding it as a feature. Fix formatting of embedded_linux.pri Task-number: QTBUG-57731 Task-number: QTBUG-58108 Change-Id: I53a2baea656df0a5b6139365ed06385c9ebc5830 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | | Enhance gn generatorMichal Klocek2017-01-121-55/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not generate actions if no moc_source_h_files or moc_source_cpp_files, handle correctly ldflags, add handling for lib_dirs, rpath and rpath-link. Add checks if 'libs' 'deps' 'include_dirs' comes from imports. Change-Id: Icee51e491f9f041cfce055f9e79acfade85c0b95 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>