summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove documentation of QWebEnginePage::ToggleSpellcheckv5.7.0Allan Sandfeld Jensen2016-06-071-1/+0
| | | | | | | | This action is not in Qt 5.7 Change-Id: I78b77b1d0cc84145b1883da1014efa38e110d00a Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.6.1' into 5.7.0" into ↵v5.7.0-rc1Jani Heikkinen2016-05-262-2/+1
|\ | | | | | | refs/staging/5.7.0
| * Merge remote-tracking branch 'origin/5.6.1' into 5.7.0Liang Qi2016-05-262-2/+1
| |\ | | | | | | | | | Change-Id: I01bc98f034ea26414d071fc42fe20bd0b7534b9e
| | * Doc: Remove repository name from examplesinstallpathAntti Kokko2016-05-251-2/+0
| | | | | | | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: I701bb08e189ae4e3ebb6cb10118900ce72791e3b Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * Fix compile issueFrank Meerkoetter2016-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building qtwebengine failed with Yocto2.1/GCC5.3 with an IMX.6 ARM target. Adding the include fixed the issue. compiling .moc/moc_qquickwebengineview_p.cpp .moc/moc_qquickwebengineview_p.cpp: In static member function 'static void QQuickWebEngineView::qt_static_metacall(QObject*, QMetaObject::Call, int, void**)': .moc/moc_qquickwebengineview_p.cpp:866:72: error: invalid use of incomplete type 'class QColor' case 15: *reinterpret_cast< QColor*>(_v) = _t->backgroundColor(); break; ^ In file included from /data/projects/fsl-community-bsp/build/tmp/sysroots/wandboard/usr/include/qt5/QtCore/qobject.h:48:0, from /data/projects/fsl-community-bsp/build/tmp/sysroots/wandboard/usr/include/qt5/QtCore/QObject:1, from .moc/../api/qquickwebenginescript_p.h:52, from .moc/../api/qquickwebengineview_p.h:52, from .moc/moc_qquickwebengineview_p.cpp:9: /data/projects/fsl-community-bsp/build/tmp/sysroots/wandboard/usr/include/qt5/QtCore/qmetatype.h:1886:1: note: forward declaration of 'class QColor' Change-Id: If58315d4c0b5087705687ae582ffe86702063937 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Document new use_appstore_compiliant_code config option in changes fileKai Koehne2016-05-261-0/+3
| | | | | | | | | | | | | | | Change-Id: I559fb89b585d6aebca3a6a351706676a27f98ef4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Update ChromiumAllan Sandfeld Jensen2016-05-262-1/+1
|/ / | | | | | | | | | | | | | | Pulls in cherry-picked security fixes from Chromium 51. Change-Id: I78075cf0379808ddd37f00aadf6e0b4e776311da Task-number: QTBUG-53643 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Improve widevine plugin searchAllan Sandfeld Jensen2016-05-251-2/+28
| | | | | | | | | | | | | | | | | | | | | | Search for Google Chrome's widevine plugin on Windows like we do on OS X. Also adds an OpenSUSE style /usr/lib64/chromium path to Linux. Change-Id: Icfbd27b24ca8a923420a249dec4b5d72d2bc6fd3 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Make dropping files onto QWebEngineView more consistentJoerg Bornemann2016-05-251-4/+7
| | | | | | | | | | | | | | | | | | | | | | When dropping files we created a DropData object with file URLs and the text set to a newline-separated list of file URLs. This is inconsistent with what Chromium does and web developers expect. Fill DropData only with one kind of data at a time. Task-number: QTBUG-53573 Change-Id: Ia808ad62389e0dc01b02c6b06182ee697f11ad40 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update ChromiumAllan Sandfeld Jensen2016-05-251-0/+0
| | | | | | | | | | | | | | Pulls in cherry-picked security fixes. Change-Id: I7800d241953cd1e26dc1a6589a0cb3008dc451e8 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Preserve paths with spaces in MOC_COMMANDKai Koehne2016-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a problem caused by change efd2ea8ea720 in qtbase. MOC_COMMAND now can contain paths with unescaped spaces, like /us/include "/Library/Frameworks (framework directory)" Splitting this just by space will lead to a broken moc call. Change-Id: Ic2875917059141ec82cf5f66243a357ac7ee0ba3 Task-number: QTBUG-53612 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Doc: Describe new features in Qt WebEngine 5.7.0Leena Miettinen2016-05-252-0/+84
| | | | | | | | | | | | Change-Id: I409dee8a8116a374ee4587f0237a62c38dc51b0c Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Remove harmful spaces in qmake argument helpKai Koehne2016-05-252-2/+2
| | | | | | | | | | Change-Id: I47182d78f9dc8ecb8b4758f3ab739eaf88c04e24 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Doc: Change OpenH264 external link titleLeena Miettinen2016-05-242-2/+3
| | | | | | | | | | | | | | | | ...to avoid collision with an autogenerated section in the licensing topic with the same name. Change-Id: Ia157837828fee835f03e04766d47441332aacaf8 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | demobrowser: Fix meta object system warningJoerg Bornemann2016-05-242-3/+1
| | | | | | | | | | | | | | | | | | | | Do not redefine QWebEngineView::iconChanged. This fixes the following warning: QMetaObject::indexOfSignal: signal iconChanged(QIcon) from QWebEngineView redefined in WebView Change-Id: I2489bfcf9379200f9bfa24345b56679f138894fe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | demobrowser: Remove connection to non-existent signalJoerg Bornemann2016-05-241-2/+0
| | | | | | | | | | | | | | This amends commit 213fbe76. Change-Id: Ie5ca9f7713b0653e0e5241eb3e99644425a3b1e3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7.0Michael Bruning2016-05-2333-116/+411
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/browser_context_adapter.cpp src/core/web_contents_adapter.cpp src/webengine/doc/src/qtwebengine-platform-notes.qdoc tests/auto/widgets/qwebenginepage/BLACKLIST Change-Id: I768fc954a9a2147fc3669961286163a0a824def3
| * | Let setContent / setHtml fail when content is too big to load.Michael Bruning2016-05-202-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium fails silently - except for a log entry - when the size of the content is larger than 2 MB. This was causing trouble because the user was not informed about the failed load at all. Task-number: QTBUG-53414 Change-Id: I80f3f36b5eac72f3809538c19ff314068b75b61d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Doc: Add a topic listing supported featuresLeena Miettinen2016-05-205-80/+190
| | | | | | | | | | | | | | | | | | | | | | | | Move some features from the platform notes to the new topic. Change-Id: I23bb0593a0e142a18ad4216a03bfe1935965fc10 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Doc: Explain why QSslError values are not usedLeena Miettinen2016-05-201-0/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-53332 Change-Id: Ia3e89287caae50ea043065cb97441ad9796c1dcc Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Remove fake dependencies in embedded linux buildsAllan Sandfeld Jensen2016-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | When doing embedded Linux builds we do not use X11 libraries. Change-Id: I704d8fd4853e2187590bc9513f55b7ec61c9c4bd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Merge "Merge remote-tracking branch 'origin/5.6.1' into 5.6" into ↵Liang Qi2016-05-195-5/+83
| |\ \ | | | | | | | | | | | | refs/staging/5.6
| | * | Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-05-185-5/+83
| | |\| | | | | | | | | | | | | Change-Id: I3d5e806345abd81fe91919bb4deecdac725c341f
| | | * Add changes file for 5.6.1Allan Sandfeld Jensen2016-05-131-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic36c55b5deaceb2a7944f33aead62c6cb31a01f9 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | * Merge 5.6 into 5.6.1Oswald Buddenhagen2016-05-122-1/+6
| | | |\ | | | | | | | | | | | | | | | Change-Id: I96aa7487c341f40c74832f00bc72995d25969329
| | | * | [Simplebrowser] Fix command line option parsing.Alexandru Croitor2016-05-111-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing just command line options to Chromium prevents loading of the initial startup url. This happens because the startup url is overridden by the last command line argument, which happens to be a Chromium option, thus an invalid URL. Fix consists in using the last command line argument as the loading url only if it can be parsed as valid url. Change-Id: I3615ef57b6eddc5098de79cba1b1ba6b6af193ef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Update chromium submodule.Michael Bruning2016-05-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes the new fix for allowing qrc access to local files. Task-number: QTBUG-52085 Change-Id: Ifae5af52580a41f7d66429324714428694a6b65a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Revert marking qrc: as a local schemeMichael Bruning2016-05-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was causing a regression that broke applications that embedded JavaScript in qrc files and accessed them from other embedded JavaScript files. This is e.g. a typical pattern for applications that used QtWebChannel. This partially reverts 29f9a2fb68568208a70ba9efef0e455b50a4d3e3 Task-number: QTBUG-53108 Change-Id: I8b26395d84258b6d9aca8e0c5f07d4435617f44d Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
| | | * | Blacklist flaky QWebEnginePage::setHtmlWithImageResource test.Alexandru Croitor2016-05-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to be an expected fail, then it seemed to work in 5.6, and for some reason it fails again in 5.6.1. Change-Id: I95161e001c3b8af3ea48fc284e448a2d8853e108 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | | Doc: HTTP GET method is always used to load URLsLeena Miettinen2016-05-193-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-53314 Change-Id: I575a740cf0cd6e788c7533f4ec87fc910f1d03fa Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | | Silence zero-as-null-pointer=constant warningsAllan Sandfeld Jensen2016-05-199-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This appears to have been added to headerclean and is now preventing us from integrating. Change-Id: I7c25a85c0d62c945d4f4a68f559000fab8c880cc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | | | Fix pasting images to web pagesJoerg Bornemann2016-05-194-2/+64
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit expects pasted images to have the MIME type image/png (see code and comment in DataObjectItem::getAsFile()). Task-number: QTBUG-53409 Change-Id: I2b0c1244d309687ad190db26c5b00718ed0c4258 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | / Fix CXX :visited selectorIlia Kirianovskii2016-05-133-5/+21
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes highlighting of visited links and now Acid3 test completely works (100 of 100). The reason is that VisitedLinkMaster must be initialized before a new RenderView will be created. Otherwise, it will not handle content::NOTIFICATION_RENDERER_PROCESS_CREATED event and therefore VisitedLinkSlave will be left uninitialized (salt_ is zero). Because of this reason CSS :visited selector was broken and didn't work. Change-Id: I769cd5dbae2ffb95fd128df634a54e562b9cc91d Reviewed-by: Ilia Kirianovskii <ilia.kirianovskii@lgepartner.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | add missing example installOswald Buddenhagen2016-05-102-1/+6
| |/ | | | | | | | | Change-Id: Ifee9bb458de2c15760da21938b5e5bb598936161 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Update Chromium submodule to include aarch64 build fix.Michael Bruning2016-05-171-0/+0
| | | | | | | | | | | | Task-number: QTBUG-52344 Change-Id: Iba16cbe6360753db4942debf5baebf752e5f5cc3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Change messagebox in simplebrowser exampleMichal Klocek2016-05-091-2/+5
| | | | | | | | | | | | | | | | In case of render epic fails, let the user leave the loaded page with dignity. Change-Id: I27f692fc0bb181c1d4f7ce43f5772d5573d7e385 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Remove notifier signals for spellchecking supportTopi Reinio2016-05-091-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | The rest of the spellchecking support was removed with d364c05d. These notifier signals were left behind, and caused them to be documented. Related documentation warnings: qquickwebengineprofile.h:144: warning: No documentation for 'QQuickWebEngineProfile::spellCheckLanguageChanged()' qquickwebengineprofile.h:145: warning: No documentation for 'QQuickWebEngineProfile::spellCheckEnabledChanged()' Change-Id: I3b03f3f22ed984d55c09d6e42a258f961c42c584 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Fix debug-only build on WindowsJoerg Bornemann2016-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | Do not attempt to build the release version of QtWebEngineProcess if Qt is not configured for release. Task-number: QTBUG-53240 Change-Id: Iff52a5049b3eefdd52c405fb80095a4d53c55fba Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-05-0914-116/+315
|\| | | | | | | Change-Id: I2843a633721212850db77c772caf24e0ea82b450
| * Doc: Add build requirements on supported platformsLeena Miettinen2016-05-061-4/+56
| | | | | | | | | | | | Task-number: QTBUG-52733 Change-Id: Id0806db78fd7a87cc78c6b284c2249a7ad203b7b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Quick fix for not working history in demobrowserMichal Klocek2016-05-044-50/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current implementation of history manager seems to be not straight forward. To display history we use QList to keep history items plus model adapter in form of HistoryModel (QAbstractTableModel) plus HistoryFilterModel to avoid duplication, plus HistoryTreeModel to make a tree view with split for dates, plus TreeProxyModel on top to enable sorting. This approach unfortunately falls apart when items should be deleted from the model by treeView. This ends badly with corrupted cached values. This fix removes history items using history manager. It also abandons HistoryTreeModel since frequent sourceReset calls make it unusable. If split for dates it desired the better approach would be to implement history tree model already at HistoryManager level to avoid unmaintainable code. Task-number: QTBUG-49913 Task-number: QTBUG-50255 Change-Id: Ic9cebb52b623bd453119e11b5e907eaa90609e34 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Fix memory leak of standardContextMenuMichal Klocek2016-05-041-0/+1
| | | | | | | | | | | | | | Add deleteLater after menu is hidden. Change-Id: I7bf7f5e83b40328e220a1ff91f07055c160b6ab9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Update ChromiumAllan Sandfeld Jensen2016-05-041-0/+0
| | | | | | | | | | | | | | Pulls in security patches from Chromium 50.0.2661.94 Change-Id: Idd71e08fe60d79074fca956d47522d708c5c2640 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * [Demobrowser] Fix command line option parsing.Alexandru Croitor2016-05-042-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing just command line options to Chromium prevents loading of the initial startup url. This happens because the startup url is overridden by the last command line argument, which happens to be a Chromium option, thus an invalid URL. Fix consists in iterating through the command line arguments, until a non-option argument is found (doesn't start with a dash), and use that as the startup URL. Change-Id: Ibe2946b25b2e023c094a85e50d2ccbd5bfce2977 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix threading issues with URLRequestContextAllan Sandfeld Jensen2016-05-034-53/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URLRequestContextGetterQt contains data which is shared between UI and IO thread. Make the class more thread friendly by making copies of the data that can be accessed from the IO thread, and protect synchronization with a full mutex instead of atomics. Also fixes circular reference between URLRequestContextGetterQt and BrowserContextAdapter. Task-number: QTBUG-50160 Task-number: QTBUG-52509 Change-Id: Idaba211533cfad229e1d1872cdfdf4e7dffeb3d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Reset the selected text of a page when setHtml is called.Alexandru Croitor2016-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When text is selected inside a QWebEngineView, the selection is stored in a RenderWidgetHostViewBase instance. When QWebEngineView::setHtml is called, the stored selection is not cleared, and thus requesting for the selected text will return stale data that is not present in the page anymore. Fix consists in calling WebContentsImpl::Unselect() after the new html is loaded and focused in WebContentsAdapter::setContent(). Change-Id: Idd0f3187f324863b9a805af6a288dccfcbd5566f Task-number: QTBUG-53033 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix QtWebEngineCore::initialize() for Qt < 5.6.1Joerg Bornemann2016-05-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt versions < 5.6.1 the constructor of QCoreApplication directly calls QCoreApplication::init and QtWebEngineCore::initialize() in turn. That means that qobject_cast<QGuiApplication*> cannot work, because the object is not fully constructed yet. This was fixed for Qt 5.6.1 in commit qtbase/1b441c39. This patch turns off the fix for QTBUG-51789 when building QtWebEngine against Qt versions older than 5.6.1. Task-number: QTBUG-51789 Change-Id: I092fb559ea4449bd443737d5962b4b87dee88cdd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Remove spellchecking supportMichal Klocek2016-05-0613-259/+5
| | | | | | | | | | | | | | | | Spellchecking API needs a bit more reviews and love. Current API is not intuitive and partly broken. Change-Id: Ie9cd371f38cca2f6b3f56a8699ad874cd332c318 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add spellcheck autotestMichal Klocek2016-05-067-0/+262
| | | | | | | | | | | | | | Skip test on osx for now. Change-Id: I8f748d00da54fd5b7217b08a18e7a58d31cb898c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Adds qwebengine_convert_dict toolMichal Klocek2016-05-064-1/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | This is a tool which converts hunspell 'dic' dictionaries to binary 'bdic' format, which is required by spellchecker in chromium. Tool is compiled as a qt console application. It reuses linking information produced by gyp. This tool cannot be used in cross-builds due to limitations of the gyp-based build system. Change-Id: Ibee8cbc6048b522c0e4fe22b21c91c649c8515bc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>