summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Stabilize tst_QQuickWebEngineViewJoerg Bornemann2016-01-221-6/+26
| | | | | | | | | | | | | | | | Remove the 200 ms wait and instead try to grab the window contents repeatedly until a certain condition is met. Change-Id: I96dd720ef41ced9bdb48772939d25dd957081c33 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Add the Google Chrome path for pepper Flash on LinuxJocelyn Turcotte2016-01-221-1/+2
| | | | | | | | | | | | | | | | This is the path used when installing the official Chrome deb packages on Ubuntu. Change-Id: Iaa30c1df17ba2c6d069d17f828ecbbd26d16237b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Fix deadlock on QWebEngineUrlRequestJob::failJoerg Bornemann2016-01-222-4/+31
| | | | | | | | | | | | | | | | | | | | | | URLRequestCustomJob::notifyFailure calls NotifyStartError(status), which in turn will result in a call to URLRequestCustomJob::Kill. We must release the lock of m_mutex before calling NotifyStartError, otherwise m_mutex.lock() will wait forever in Kill. Change-Id: I319e45049766c2192dfc46a91b352b92ec677bc6 Task-number: QTBUG-50160 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Make all examples BSD licensedKai Koehne2016-01-2253-1529/+1477
| | | | | | | | | | Change-Id: I98924e5f8754b7b2ed095abf00eb73fa26399b2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Update ChromiumAllan Sandfeld Jensen2016-01-222-1/+1
| | | | | | | | | | | | | | Pulls in the fixes for public CVEs fixed in Chromium 48. Change-Id: I8738c7d0631e2e42ad844ada2b43dd614b4518c8 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Doc: Corrected reference to BrowserWindow.qmlNico Vertriest2016-01-221-1/+1
| | | | | | | | | | | | Change-Id: Ie6da4f94233a336c497074a5a9a83d27a86329ae Task-number: QTBUG-43810 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* | Doc: warn about heavy routines blocking content renderingLeena Miettinen2016-01-202-0/+6
| | | | | | | | | | | | Task-number: QTBUG-50092 Change-Id: I1f3bbcab3b1999b9ecc86660ff9fef8330775cb4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add autotest for URL scheme handlersJoerg Bornemann2016-01-191-0/+75
| | | | | | | | | | Change-Id: I372366afce46703b9960ef2a8e5f575eaedb2514 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Avoid full storage update on installing URL scheme handlersJoerg Bornemann2016-01-193-3/+10
| | | | | | | | | | | | | | | | | | | | | | When installing/removing URL scheme handlers, do not update the full URLRequestContextStorage. Only update the job factory. This avoids calling the - potentially expensive - generateStorage() method superfluously often. Change-Id: I99c4ec479fcfdee4e97d86b858ea42f3cdccfec4 Task-number: QTBUG-50160 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Widgets: Add example names to documentationSzabolcs David2016-01-191-2/+2
| | | | | | | | | | Change-Id: I73f6e944e3a64b948b86882e951f85593fdb800f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Widgets: Improve geometryChangeRequested signalSzabolcs David2016-01-196-1/+22
| | | | | | | | | | | | | | | | | | Use this signal to notify the user on JavaScript window move/resize requests. It works only for windows opened by JavaScript (according to the Chromium browser's behavior). Change-Id: I7fdeda4c252cc4badb36b74ed61d947be690f45a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Doc: link capturing methodsLeena Miettinen2016-01-192-1/+17
| | | | | | | | | | | | Task-number: QTBUG-48435 Change-Id: If7117ecb11a0f06df1204dc91757a29c5444e189 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: remove docs for QWebEngineCookieStore::FilterRequest classLeena Miettinen2016-01-191-32/+0
| | | | | | | | | | | | | | The class and its members were removed. Change-Id: Ib8e892da1f9e10ffcf9861f75615ef48d3697886 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Use QFileInfo::exist(f) instead of QFileInfo(f).exists()Anton Kudryavtsev2016-01-192-4/+4
| | | | | | | | | | | | | | and QFile::exist(f) instead of QFile(f).exists(). It's faster. Change-Id: I2d5ffb2e64a547d3c703ad048ef0c75a7ccfe0d3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Allan Sandfeld Jensen2016-01-182-30/+63
|\ \
| * | 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>
* | | Correct QWebEngineUrlRequestInterceptor documentation.Michael Bruning2016-01-181-3/+1
|/ / | | | | | | | | | | | | | | | | | | The documentation was still based on the initial version of the method, where it had to return a boolean value. This is no longer the case and hence removed from the doc. Change-Id: Ica1e4a769631c0169bc5e59abd54c25a416cf4a9 Task-number: QTBUG-50513 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Remove FilterRequest from qwebenginecookiestoreMichal Klocek2016-01-156-66/+3
| | | | | | | | | | | | | | | | | | | | 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-153-109/+52
| | | | | | | | | | | | | | | | | | | | 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>
* | Update logo of demobrowserKai Koehne2016-01-143-408/+22
| | | | | | | | | | | | Change-Id: I26b907d943ebd424087c54465608598aaf0d0013 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Fix namespaced build of markdowneditor exampleJoerg Bornemann2016-01-141-0/+2
| | | | | | | | | | Change-Id: Iff50511b06962d02e2a69ee47f1f0df82425dc2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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 tst_QQuickWebEngineViewGraphics::showHideShow for OS XJoerg Bornemann2016-01-131-1/+8
| | | | | | | | | | | | | | | | | | Defer the TestView::exposeChanged signal. On OS X exposeEvent is called directly by view->show(). Thus exposeChanged was emitted before signalSpy.wait() was called and the check on wait consequently failed. Change-Id: Ie318f8ddc0d1bcc35a14c73e615798b3e164739c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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>
* | 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>
* | Stabilize tst_QWebEnginePage::symmetricUrl some moreJoerg Bornemann2016-01-111-1/+2
| | | | | | | | | | | | | | | | The second call to setUrl might override the first setUrl, depending on the timing. Change-Id: I30a8257751be3256a61668bd57195b1a12154d68 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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>
* | | Stabilize tst_QWebEnginePage::symmetricUrlJoerg Bornemann2016-01-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sequence view.setUrl(dataUrl2); view.setUrl(dataUrl3); might result in a navigation entry for dataUrl2 or not, depending on whether the first call completes before the second call would overwrite the pending load. Change-Id: I487ada16517daa218078af007083a68c01697c9c 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 18:31:14 +0000