summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Unify license header usage.Jani Heikkinen2016-02-01261-2792/+3546
| | | | | | | | | Update files using old header.LGPL3 to use header.LGPL Update files using old header.FLD to use new header.FDL Update files using old header.BSD to use new header.BSD Change-Id: I36a67aaa8c3ca6c7946308defc9c03c3571a7d23 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: mark drag event methods as reimplementedLeena Miettinen2016-01-281-0/+12
| | | | | | | | To have them listed in the documentation as reimplemented functions and to suppress QDoc warnings. Change-Id: I4e7f9e6649897c31696d68471ecdf93664787476 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: use the \a command for a variable to fix a QDoc errorLeena Miettinen2016-01-281-1/+1
| | | | | | | In QWebEngineDownloadItem::setSavePageFormat Change-Id: Ieeefcce8007de6fa2258591028f0ec108fc8c69b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Extend HttpCacheType with NoCache optionSzabolcs David2016-01-276-3/+12
| | | | | | | | | Add option to disable cache with passing NULL as cache backend. It behaves the same way as using HttpCache::set_mode(DISABLE), but saves some memory without instantiating backend factory. Change-Id: I1565cc773eda21a6bc73eebe14ab8046252a7755 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Remove superfluous enable_plugins=1Kai Koehne2016-01-272-2/+0
| | | | | | | | chromium/build/common.gypi already sets enable_plugins to true by default for desktop platforms. Change-Id: I3805a6856fe70ad3bd89606e974b02858e68e263 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Package devtools_resources separatelyKai Koehne2016-01-275-3/+19
| | | | | | | | | | | Move the resources for remote debugging out of qtwebengine_resources.pak, into a separate qtwebengine_devtools_resources.pak. This allows developers to decide at deployment phase whether to ship the (rather large) resources for the devtools feature, or not. Task-number: QTBUG-50646 Change-Id: I74c75ad30989b97a63e6bce3abbc33360d1452e4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix un-processed drag events not being handled on OSX.Alexandru Croitor2016-01-233-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a QDragMoveEvent is posted, we have to notify Chromium, and wait synchronously, for the possible drag and drop action at the respective coordinates. This is done by executing an inner event loop. The drag move event was processed in the inner event loop as a side-effect, specifically when another event (like a QMouseMove or QKeyPress) was forwarded to Chromium, which in turn called DoWork implicitly. The side effect led to incorrect behavior, when the mouse button is released and the drag operation should be finished. What actually happened is that additional queued DragMove events were being sent by OSX after the mouse release, and the process was stuck in the inner event loop, because Chromium's DoWork was never called. And only after moving the mouse a bit (and thus forwarding MouseMove events), the inner event loop was quit, and the drag operation finished. To actually make Chromium handle the DragMove event, we have to manually call DoWork on the inner event loop. Also because the possible drag and drop action is sent via IPC from the render process to the main process, there is a race condition that the the message might not be handled on the first manual call of DoWork, so we set up a QTimer to continuously call DoWork, thus polling for the message. Once the message is handled, the timer is stopped. In practice this leads to at most two timer timeouts. Change-Id: I8dc37a9c47ea5b675e15ebd138bc0e616b522049 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Enable Widevine CDMAllan Sandfeld Jensen2016-01-1912-1/+420
| | | | | | | | | | | Enable loading Google Chrome's Widevine pepper plugin. Flash and Widevine plugins will now also be searched for in the plugins/ppapi directory. Task-number: QTBUG-50132 Change-Id: I28fb56bb08d7e81629e34420be626621a7981181 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Merge branch '5.6' into devAllan Sandfeld Jensen2016-01-1814-189/+144
|\ | | | | | | Change-Id: I038f3544785862f3a2e2f35b8fab0b163e75d542
| * Merge remote-tracking branch 'origin/5.5' into 5.6Allan Sandfeld Jensen2016-01-182-30/+63
| |\ | | | | | | | | | Change-Id: I591be7a7131d85a269bf12fbd5c47a0ccf6ce574
| | * Update license header for qwebenginepage.cpp to LGPLv3Joerg Bornemann2016-01-141-21/+35
| | | | | | | | | | | | | | | | | | | | | This amends commit 3b4eec9b. Change-Id: I19e8a295fa7e64ff83c26b6965097bd0ae3cbf73 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * Update key code mappings using QtWebkit mappings as reference.Alexandru Croitor2016-01-121-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | Copy additional key code mappings from PlatformKeyboardEventQt.cpp. Also add a mapping for missing numeric keypad equals key. Change-Id: Ia6c4413795293be84bcd8ea9d981d8cdfb94509b Task-number: QTBUG-50401 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * Send proper key codes for KeyEvents to WebKit.Alexandru Croitor2016-01-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | A few KeyEvents to key code mappings were incorrect or missing. Fix them. Change-Id: I74087768fddd467993f04ed8b4c2dc6345d20e8a Task-number: QTBUG-50354 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Remove FilterRequest from qwebenginecookiestoreMichal Klocek2016-01-154-51/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnCanSetCookie and OnCanGetCookies should both be mapped to API. Since the other call is missing (filter cookies which should be send) remove existing one from 5.6 Change-Id: I4f42c4a1fee6add7a5efffaf4c38877a1f35ce61 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Remove callback functions from qwebenginecookiestoreMichal Klocek2016-01-152-84/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all callback api calls, rename getAllCookies to loadCookies, update documentation. New function name reflects the fact the cookieAdded signal is always emitted when cookies are loaded from the store. Change-Id: Iab7bb04871c7396d2e23306a10084d425426a19f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Fix crash in BrowserContextAdapter::removeCustomUrlSchemeHandlerJoerg Bornemann2016-01-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Do not cache the end iterator, because erase might invalidate it. Do not increment the iterator in the erase case. Change-Id: I1cbad04fdaaf1bf4cfae252bb7569d817b6ab5a5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Fix access of freed dataAllan Sandfeld Jensen2016-01-151-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The string parts inside the lambda construction were already freed, so instead use a simpler construction where we are sure we are still holding the stringlist. Change-Id: I3559ab9d203b368e2d62efef73497ce7f9135cc5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Do not return negative values in WebEngineHistoryListModelMichal Klocek2016-01-151-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | QSortFilterProxyModel does not like negative values which were returned when adapter was not yet initialized. Add missing guards for adapter. Change-Id: I3d1dd5343aaf2c4d5504950005b05fb650835884 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | Doc: Document support for proxiesKai Koehne2016-01-151-0/+9
| | | | | | | | | | | | | | | Change-Id: Icde2ed5519fe27d7b69d89e1c734d466cf65dfe3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Fix access after freeAllan Sandfeld Jensen2016-01-151-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | If deleteLater is called from the destructor of LocationProviderQt, QtPositioningHelper shouldn't be accessing LocationProviderQt from its destructor. Change-Id: I1f2344edc1918fcfa566c3cd6045694cabf89768 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Fix initialization order of m_webChannelAllan Sandfeld Jensen2016-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The initialization order did not match the declaration order causing compiler warnings. Change-Id: I3c852525736a145202085a698b542a7df7c3a9d9 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Have a WeakPtrFactory per thread in URLRequestCustomJobJoerg Bornemann2016-01-152-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must separate WeakPtrs per thread. Otherwise we run into a DCHECK in weak_ptr.cc: "WeakPtrs must be checked on the same sequenced thread.". Done-by: Allan Change-Id: I6ae971b01fb8f8ecda13e50798d6315dcf19d96e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Doc: Use WebEngine.settings.pluginsEnabled as exampleKai Koehne2016-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | javaScriptEnabled is true by default, so setting it explicitly to true is a bit dubious. Enabling pluginsEnabled (which is false by default) is a better example. Change-Id: I8a94d0fed895c6bc4211bd6718aaba34a437f8c5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * | Show host only in authentication dialog to reduce window sizeJoni Poikelin2016-01-141-2/+3
| | | | | | | | | | | | | | | Change-Id: I6742fb003420404dafdcf204b5c3e9ffd9f474fc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Fix access violation error because of access to an invalid QString.Alexandru Croitor2016-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6ed125c0073288f46e544b9d415d1f9a9968cb2d introduced the usage of QT_USE_QSTRINGBUILDER, which caused an issue in BrowserContextAdapter::httpAcceptLanguageWithoutQualities, incorrectly deducing the return type of the lambda. Fix consists in explicitly setting the return type of the lambda to QString. Change-Id: If3f8992e031838e899d35bcd2f962d051976a8f7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Add API to set WebChannel on isolated worldAllan Sandfeld Jensen2016-01-1514-33/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to set a web-channel so that it can only be accessed by private scripts. Pulls in needed API extension in 3rdparty. Task-number: QTBUG-50318 Change-Id: I61bcce5c318dffe0a406ee8cddf31f58a021c22c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Merge "Merge branch '5.6' into dev" into refs/staging/devAllan Sandfeld Jensen2016-01-1375-381/+1051
|\ \ \
| * | | Merge branch '5.6' into devAllan Sandfeld Jensen2016-01-1275-381/+1051
| |\| | | | | | | | | | | | | | Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
| | * | Move ICU data to resources sub-dirAllan Sandfeld Jensen2016-01-112-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moves the ICU data from the prefix root to the resources subdir. Change-Id: I1eec6c09a8ff1f87166a9f8a2a010b770198751e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Liang Qi2016-01-116-0/+35
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-076-0/+35
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginepage_p.h Change-Id: I050b4c7691a070e04cace2663ad633903f6d96a9
| | | | * Update chromium submoduleJoerg Bornemann2016-01-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull in a Windows build fix and update linpng. Change-Id: Ifca13944d4f5b517f19e73f358f7b75a105bd9f3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | | * Fix MouseMove event handling when opening a new tab with middle click.Alexandru Croitor2015-12-226-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When opening a new tab by middle clicking on a link in a web page, two MouseMove events are sent to Chromium consecutively, without getting proper acknowledgment events, which causes further move events not to be handled properly. Fix consists in preventing the second move event from being sent. Change-Id: Ia0a64698476226e472faa53f75b51dfb6ed477c9 Task-number: QTBUG-50031 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | | Avoid creating contents adapter on webchannel accessAllan Sandfeld Jensen2016-01-092-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Postpones the setting of webchannels until the content adapter is created normally. This also simplifies maintaining it over changing adapters. Change-Id: I19b861acd3310a7d98c79059911f6ce8c042760b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * | | Implicitly use QStringBuilder in all modulesJoerg Bornemann2016-01-098-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every Qt module is built with QT_USE_QSTRINGBUILDER by default. Also define QT_USE_QSTRINGBUILDER in the core API library. Remove superfluous qstringbuilder.h includes. Keep the use of operator% to make sure that QT_USE_QSTRINGBUILDER won't vanish in future build system changes. Change-Id: I41fd036fc4e6063951cd758aaafdf9aefed7dd5a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | | Avoid creating contents adapter when setting background colorAllan Sandfeld Jensen2016-01-081-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the initial setting of a non-default background color to initialization, so we don't need to force the creation of the contents adapter if a WebView component sets the background color. Change-Id: Iabd0146e6072653962877162d66da58154faf770 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
| | * | | Simplify search for Flash plugin on WindowsKai Koehne2016-01-081-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking for C:\Windows\SysWOW64 is actually non needed, because 32 bit apps will automatically see this directory as "C:\Windows\System32" on 64 bit Windows. Change-Id: Ic2e847a287632955970893be91b00489dd7ab0a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | | Fix warning about unused d-pointerJoerg Bornemann2016-01-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This amends commit 4f850494. Change-Id: I3004c38b03ab4a903cb987400c61e855b2cc584e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | | Fix resources location for developer buildsJoerg Bornemann2016-01-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pak files must be in a "resources" sub-directory since commit d18b3e7c. Change-Id: Ia5191b1c532cf630be8c2d123261421a39d6a5ee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | | Ensure contents adapter for running javascriptAllan Sandfeld Jensen2016-01-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should be possible to run javascript on a view being initialized. Change-Id: Ia715bb6b897caa33308f7b042c3aa46aa1b45cd7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | | Enable loading of Flash plugin on Windows 64 bitKai Koehne2016-01-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pepper plugin is available on 64 bit in C:\Windows\System32\Macromed Also do not give up after finding a candidate file (because it might be the wrong bitness). Change-Id: I70af34fbcabeec792e8c74d8010476477c6e91dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | | Make lazy contentsAdapter initialization lazierAllan Sandfeld Jensen2016-01-072-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By postponing the creation of the contents adapter until the eventloop is started we can avoid creating it multiple times if the profile is changed during QML loading. This also works around a bug on startup of quicknanobrowser in single process mode, but doesn't solve the underlying problem. Change-Id: I8859fd91dd828658b363ebf89ca619a193deaefc Task-number: QTBUG-50256 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * | | UIDelegate: setParentItem for dialogsJochen Seemann2016-01-071-1/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the visual parent of the dialogs like we already do in showFilePicker(). This is needed when overriding the standard Window-based dialogs with Item-based dialog, e.g. on platforms that only support one window. Change-Id: I99e9397211994d027afea6f7557acf3ebc4ac424 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | Install qtwebengine resources in a sub-directoryAllan Sandfeld Jensen2016-01-062-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the qtwebengine resource files to a resource sub-directory so they are not installed in the prefix-root. At the same time the search of them is improved, so application developers can install them in the application dir, even if the prefix dir exists. Change-Id: If64f16ae6ee924c66fb0a0b024bca2caa6400ee3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * | Propagate qmake's warnings-are-errors settingAllan Sandfeld Jensen2016-01-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable -Werror when Qt is configured to not use it. Change-Id: Icc4d291cf941fc27b19aa2170796985c20eced8e Task-number: QTBUG-50254 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | Fix more syncqt warningsAllan Sandfeld Jensen2016-01-0510-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change include form to follow standard Change-Id: I8b30ae9a6923365d524c473f2807b76e4fccebf4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | Fix an assertion in QWebEngineCookieStoreSzabolcs David2016-01-054-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't process pending cookies after resetting the CookieMonster to 0 in the CookieMonsterDelegateQt. We are destroying the old cookie store, so we can reject the pending cookies here. Task-number: QTBUG-50160 Change-Id: I0b2ca7ee0f5e3fdcf99680bb9c0a2772a10ff3f4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Doc: certificate management in Qt WebEngineLeena Miettinen2016-01-053-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-49987 Change-Id: I04440144566d7a0caf36f6eaf3b724a02cf58205 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | Use QOpenGLContext::isOpenGLES() to check if OpenGL ES is enabledSiteshwar Vashisht2015-12-211-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QOpenGLContext::openGLModuleType() performs a general check whether OpenGL ES support is enabled or not. However it is possible that a specific OpenGL context does not have OpenGL ES support enabled even when QOpenGLContext::openGLModuleType() returns QOpenGLContext::LibGLES. In such situations QOpenGLContext::isOpenGLES() method is correct way to determine if the context is an OpenGL ES context. Task-number: QTBUG-50015 Change-Id: I319c2932a62027d3142040045a46cdcb12fcdebe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Doc: add info about unavailable API from the wikiLeena Miettinen2015-12-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://wiki.qt.io/Porting_from_QtWebKit_to_QtWebEngine Change-Id: Ic28e2140ca1dd9643d68a0a21bdd30317b70e282 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 12:43:02 +0000