summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Allan Sandfeld Jensen2016-03-1135-141/+705
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-03-0835-141/+705
| |\ | | | | | | | | | Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc
| | * 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>
| | * Configure MIPS architecure for gypAllan Sandfeld Jensen2016-03-032-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Parses MIPS architecture information on from qmake to gyp. Task-number: QTBUG-51580 Change-Id: Icdd164aa1379b7f0b93773cb061f95f204db8494 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * Revert "Disable using the ICU data file on embedded linux"Kai Koehne2016-03-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c5957ac90cbaccccbd58b3fc73f94cf0d4795e54. It was based on the assumption that we remove system ICU, which got removed in commit 94b550ebee2858756a293aacf7e78e7ce11bb9c9. Task-number: QTBUG-51156 Change-Id: I7ac1adb414d250b2887af936ae3dc74a919a0890 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * ICU: Do not try to search for icudtl.dat for WEBENGINE_CONFIG+=system_icuKai Koehne2016-03-012-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not try to find icudt.dat if we use system ICU. This avoids warnings like Qt WebEngine ICU data not found at /usr/share/qt5/resources. Trying parent directory... Qt WebEngine ICU data not found at /usr/share/qt5. Trying application directory... Qt WebEngine ICU data not found at /bin. Trying fallback directory... The application MAY NOT work. on every startup, e.g. for embedded linux. The defines and macros are the same as in chromium. Task-number: QTBUG-51156 Change-Id: I6c24b73cca88020504489695e889f49c5d7be424 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * ICU: Sync use_system_icu and icu_use_data_file_flagKai Koehne2016-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | If we use the system ICU we do not need to care about loading the data file. Task-number: QTBUG-51156 Change-Id: I9f9c61c39db50663105e99af001c7e9f56322717 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * Enable qmltests in CIJoerg Bornemann2016-03-014-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | Blacklist failing tests. Stabilize some tests. Change-Id: I9fba81fb70f5b358108ef6935e363297e2658f79 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Add minimal examplesKai Koehne2016-03-0110-1/+338
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-51383 Change-Id: I872bdae7267e7dbf2a93a831d435517bcd4bad64 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * MSVC: Fix compiler warningKai Koehne2016-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix release build warning: api\qquickwebenginetestsupport.cpp(47) : warning C4100: 'success' : unreferenced formal parameter Change-Id: I3cdab22daa6b55abce55e217461952a192230428 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Doc: Improve web engine profile class descriptionsLeena Miettinen2016-02-292-12/+46
| | | | | | | | | | | | | | | | | | | | | | | | Add information about the most important methods and properties. Change-Id: I41ae039a0cc6084b62b492560def5eed7d8d3742 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I1d1b38dd5f78d8a949bab7f9a4643a2430657458 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * Copy resources also for non-developer non-prefix buildsKai Koehne2016-02-251-2/+2
| | | | | | | | | | | | | | | Change-Id: I8a31a83c996761e3997e5efa44aeaad04f24375f Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * Enable QtQuick inspectorserver test in CIJoerg Bornemann2016-02-252-1/+5
| | | | | | | | | | | | | | | Change-Id: I7c5f59a48688ca73889605ef5850ebedf43782de Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * Enable WebEngineView tests in CIJoerg Bornemann2016-02-241-1/+0
| | | | | | | | | | | | | | | | | | Change-Id: I6534d36279feffb66eb6a897ed31d4b013b39691 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Add chromium files to Qt projectAllan Sandfeld Jensen2016-02-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make them indexed by Qt Creator, but may make launching on a non-SSD slower. Change-Id: Ifa6e54c06ef06f68fa277a408fa7b0783d715199 Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | * Implement SSLHostStateDelegateAllan Sandfeld Jensen2016-02-235-1/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class was introduced to track accepted certificate errors. Our lack of implementation caused a regression in certificate error handling. Task-number: QTBUG-51319 Change-Id: Idf3314fd17a5f9cb13a4513a3ccdb40954519c0d Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * Always reject non-overridable certificate errorsAllan Sandfeld Jensen2016-02-231-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | We don't call the callback in case the error can't be allowed anyway, so we should tell the caller right away the error was denied. Task-number: QTBUG-50581 Change-Id: I8fcd72b7fbab5a8cbaffba95c6f97777c301cb64 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * Add tools to project for Qt CreatorAllan Sandfeld Jensen2016-02-231-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Adds the tools and qmake scripts from qtwebengine to the project so that QtCreator can find them. This is the same we did in QtWebKit. Change-Id: I09ffdb6158adcbacd9dc4958ad199917e321498a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * Enable qquickwebenginedefaultsurfaceformat test in CIJoerg Bornemann2016-02-221-1/+0
| | | | | | | | | | | | | | | Change-Id: Ia0dcc45a3b63da49b82cd4f018979df43e847273 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * Enable quick/publicapi test in CIJoerg Bornemann2016-02-222-2/+2
| | | | | | | | | | | | | | | | | | | | | Also, update the API list. Change-Id: Ib21feb823ecf58c071316f796a7e251c9f99bff4 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * Prepare separate enabling of QtQuick autotestsJoerg Bornemann2016-02-227-3/+7
| | | | | | | | | | | | | | | Change-Id: I330de920c339e31725d123eadf5dcc4227dd500f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | Clean up FaviconManager and fix icon url in NavigationEntryPeter Varga2016-03-118-282/+145
| | | | | | | | | | | | | | | | | | Change-Id: I56a109c9071ef581c6a51b5b7b8ce5a2464c6a76 Task-number: QTBUG-51179 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Cleanup QUrl initialization in favicon-manager testAllan Sandfeld Jensen2016-03-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | No need to call QUrl constructors multiple times. And we should avoid using remote URLs even invalid ones that still cause DNS lookups. Change-Id: I251784a3d607377986349f196b893cf3a45656a7 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | | Fix CDM plugins not always being loadedJocelyn Turcotte2016-03-101-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the issue in a similar fashion to what Chromium is doing in chrome/browser/download/download_target_determiner.cc. PluginService::GetPlugins is the only way that the plugin info can be loaded. Since we can't do it on demand from the IO thread in a synchronous handler, do explicitly during the WebEngineContext initialization. Task-number: QTBUG-50132 Change-Id: I8ed796b541c880caf8546230b3a5011047eb0fe3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Fix and skip failing Quick tests after Chromium 49 updatePeter Varga2016-03-106-4/+7
| | | | | | | | | | | | | | | Change-Id: I1d8d221787c11bc8461e4989b0e5a5ece1c7d572 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Update to Chromium 49.0.2623.91Allan Sandfeld Jensen2016-03-093-1/+3
| | | | | | | | | | | | | | | Change-Id: I43c545d1600bebabf6b94209beb91b3d3c4cd244 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Require OSX SDK version of at least 10.10.3.Alexandru Croitor2016-03-082-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium 49-based uses new OSX API which was added in SDK 10.10.3. Make sure not to allow compilation in case the SDK version is lower than that. This also reverts commit 70ed3812fbe5eee6f62ddb26251f46061b0d3675 to allow compiling on OSX 10.9, with an appropriate SDK. Task-number: QTBUG-51350 Change-Id: Ib6dab0a1e16734cda9429363c90d2c8b8838d833 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Fix iconChanged signal in Quick APIPeter Varga2016-03-083-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not emit iconChanged signal twice if icon url does not change. This fix implements the same behavior for icon handling in Quick as in the Widget API. Change-Id: I9fcc27c9cec3cbef74fb0a71026065e359a5cbc3 Task-number: QTBUG-51179 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Use system protobuf if foundAllan Sandfeld Jensen2016-03-082-2/+8
|/ / | | | | | | | | | | | | Search for protobuf library and compiler, and use them if found. Change-Id: I310eca661ed2dda14349e84a6769d2ae79ffb7c5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update GL mailbox synchronization to Chromium 49v5.7.0-alpha1Allan Sandfeld Jensen2016-03-075-147/+127
| | | | | | | | | | | | | | | | | | | | | | Chromium 49 switched to using SyncToken, making our old model based on sync-points obsolete. This patch rewrites our syncing to instead take advantage of new Chromium API for waiting on sync tokens. It also moves the creation of the GLFences we use out of Chromium. Task-number: QTBUG-51173 Change-Id: I04d726d4bc81bf6b7fe39bb2b5507e84a0b6991e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix loadProgress 100Allan Sandfeld Jensen2016-03-072-2/+3
| | | | | | | | | | | | | | | | | | After upgrading to Chromium 49 we no longer get the last progress signal with 100% completed. Task-number: QTBUG-51173 Change-Id: I304e8833a0e707199cfa56a078b0c4d79c1b5c30 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Porting browser_accessibility_qt to Chromium 49Allan Sandfeld Jensen2016-03-075-118/+20
| | | | | | | | | | | | | | | | | | | | Blink now handles those rules, which means we don't have to. It however also means 'name' now contains inner-text like it is supposed to on paragraph elements. Task-number: QTBUG-51173 Change-Id: I5afbd56ac5787bbdac96e5a83af150ccbcac37e2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add stub for RequestPermissionsAllan Sandfeld Jensen2016-03-072-1/+38
| | | | | | | | | | | | | | | | | | This doesn't appear used yet, and our implementation mirrors that of the Android WebView. Task-number: QTBUG-51173 Change-Id: I53396b8b97febd45441cf0add54de4f47b289348 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Basic adaptation to Chromium 49Allan Sandfeld Jensen2016-03-0749-180/+198
| | | | | | | | | | | | | | | | Converts types, callbacks and headers to match Chromium 49. Task-number: QTBUG-51173 Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update snapshot scripts to Chromium 49Allan Sandfeld Jensen2016-03-074-6/+10
| | | | | | | | | | | | | | | | | | The multi megabyte ICU assembler files are now omitted, as we instead either generate data files or use system ICU. Task-number: QTBUG-51173 Change-Id: I7c7594be08876751ffd73171550000a28399954f Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Register qrc as secure after blink initializationAllan Sandfeld Jensen2016-03-072-2/+17
| | | | | | | | | | | | | | | | | | | | We need blink to be initialized before we can rely on scheme registering to work. This should fix race-conditions of qrc as secure registrations. Change-Id: Icd4334a6ff74671bec2ccc506336d0e073d9ca39 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Skip building on 32-bit windows hostsAllan Sandfeld Jensen2016-03-052-5/+13
| | | | | | | | | | | | | | | | We keep running out of memory during linking and must skip building on 32-bit architectures until that problem is solved. Change-Id: Ib0b465cb033df0112133eb256adeb498d260da7f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Blacklist getUserMediaRequest on WindowsAllan Sandfeld Jensen2016-03-051-0/+3
| | | | | | | | | | | | | | | | It fails occasionally on the CI. Change-Id: I684f78785568cd78c3d817133dbc5795e7d61f0e Task-number: QTBUG-51652 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add back revisions for QQuickWebEngineSettingsPeter Varga2016-03-032-18/+14
| | | | | | | | | | | | Change-Id: I5f53a8563c47c4a37c77932c5d6f7d084b324c4f Task-number: QTBUG-40043 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Update chromium submodulePeter Varga2016-03-021-0/+0
| | | | | | | | | | | | | | | | Pull in OS X build and symlink fix. Change-Id: I706a12c1919ebf35cbd260bbffeaa53c82efaac5 Task-number: QTBUG-51350 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Only set fastbuild once on the gyp commandlineAllan Sandfeld Jensen2016-03-021-7/+8
| | | | | | | | | | | | | | We were setting it to both 1 and 2. Change-Id: I1b2a063d06e3cb664ae587dd6dc78fa589297c4b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Skip crashing test on windowsAllan Sandfeld Jensen2016-03-021-0/+3
| | | | | | | | | | | | | | | | | | This test crashes on the CI system on Windows, and needs to be skipped until we have fixed the issue. Task-number: QTBUG-51608 Change-Id: Icc11fe062626f58ea32f06b332074af16e146b7d Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Move printToPDF to pageAllan Sandfeld Jensen2016-02-257-28/+27
| | | | | | | | | | | | | | | | | | The API needs nothing from view and view just forwards it to the page anyway. This is an page level API, this also makes it work without being shown. Change-Id: I3b8555ab472ec2c7632db3655bcc31925fcfa001 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Skip flaky HTTP cache test casesSzabolcs David2016-02-251-0/+5
| | | | | | | | | | Change-Id: I1602bd5f7f63c1f7f438a2eab00b9bb69f3fd1a6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge "Merge dev into 5.7" into refs/staging/5.7Oswald Buddenhagen2016-02-233-24/+20
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 19:13:08 +0000