summaryrefslogtreecommitdiffstats
path: root/src/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-1115-23/+141
|\ | | | | | | Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
| * Register qrc as local after blink initialization.Michael Brüning2016-04-052-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | It is needed to let local content access the qrc resources by making them part of the same security origin. This is stated in the docs as the default behavior. This also backports change f7d343000d77c80f34a115fe9c78f101929292b1 from 5.7, which fixed some race condition with the qrc registration. Task-number: QTBUG-52085 Change-Id: Ia704fa6dbce8529f82695ab543244020cb9f8b8a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Implement CheckMediaAccessPermissionAllan Sandfeld Jensen2016-04-057-0/+35
| | | | | | | | | | | | | | | | | | | | | | Fixes access of label of MediaStream tracks Also fixes the logged error: WebContentsDelegate::CheckMediaAccessPermission: Not supported. Change-Id: I3fee9ccd9e8b2e5cbd6b707336cc61425a44ba31 Task-number: QTBUG-52216 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Fix typo in the folder name of the cookiesSzabolcs David2016-04-031-2/+7
| | | | | | | | | | Change-Id: I9e1acaa0dbd31978730dae33ebb517f467f8df49 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix crashes due to qputenv being called after Chromium initialization.Alexandru Croitor2016-04-012-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qputenv() call inside gl_surface_qt.cpp, which is executed on a GpuChildThread, can reallocate the process environment structure, and it is possible that at the same time the main thread calls getenv, which will dereference a pointer to the freed environment structure, essentially causing a use-after-free crash. Make sure the qputenv() call happens before Chromium initialization starts, so no thread-race can occur. Change-Id: I4ecbdc8bf2abbe45f7d6c5d2633dc9fe27f51e66 Task-number: QTBUG-52124 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> (cherry picked from commit 76c61aa1400ef2def204c3732e30e08e40631e8d)
| * Use system NSS only for certificate handlingKai Koehne2016-04-011-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiling against NSS 3.23 fails with current Chromium. Also, with NSS 3.21 there are failures connecting to e.g. google.com. Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL is always used for cryptography, and NSS only for certificate handlng. Patches included in 3rdparty update: 0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build. 0472123 Fix build against newer NSS 90c62c4 <third_party/libpng> [Backport] update to libpng 1.2.56 34857b8 <third_party/libpng> [Backport] Stop large iCCP chunks causing delays and "Aw Snap!" Task-number: QTBUG-52193 Task-number: QTBUG-51890 Task-number: QTBUG-52068 Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Avoid triggering extra urlChanged signalAdam Kallai2016-04-012-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium usually clears the pending entry when it fails, so that an arbitrary URL is not left visible above a committed page. However, it does preserve the pending entry in some cases, such as on the initial navigation of an unmodified blank tab. So in other cases Chromium clears the pending entry (if the navigation is not in progress), and it does force the UI (URL bar) to refresh. In our case we allow failed URLs to stick around in the URL bar but only when alternate error pages are used. Change-Id: I26e81e7a99415aa184880dcb647a06d977584119 Task-number: QTBUG-48995 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Fix Windows build when response files for moc are generatedJoerg Bornemann2016-03-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | moc.prf contains magic (translation: weird heuristics) to determine if the moc command line would exceed the command line length limit on Windows. If such an excess is detected a response file is created in MOC_DIR. As our build directory is not qmake's default one, moc calls will not find the response file. Set MOC_DIR accordingly to generate the reponse file in the right location. Task-number: QTBUG-51847 Change-Id: Id0695451a986cd9514a7c965c6d33c5c3ef800cd Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Fix CommandLine initialization on WindowsJoerg Bornemann2016-03-311-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | Chromium insists on getting the command line via the system call GetCommandLineW. QCoreApplication already did that, and we want to pass the already split argument vector to init CommandLine. This way, the user can pass custom arguments to QGuiApplication, and Chromium will pick those up correctly. Task-number: QTBUG-51971 Change-Id: I85b2071fcd8e5781b13ec8d22dc00b1a0c71601b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Fix QtWebEngineProcess not being found after macdeployqt is used.Alexandru Croitor2016-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently on OSX, two Info.plist files are generated and copied to the QtWebEngineCore framework, one into Contents/Info.plist and another into Resources/Info.plist. The first one is generated by core_headers.pro and the second by core_module.pro. OS X frameworks only use the plist found in the Resources directory, and the Contents one was generated by qmake erroneously, assuming that core_headers is an application, rather than a framework. When macdeployqt is used with -always-overwrite option, it copies Contents/Info.plist (which contained an incorrect bundle id) over to Resources/Info.plist, and afterwards when an application is executed, it cannot find the plist file because it contains the the wrong CFBundleIdentifier, thus not being able to find the QtWebEngineProcess. Fix consists in making sure code_headers.pro does not generate an Info.plist, and just use the one generated by core_module.pro. Change-Id: I6295bde3b1d1771ed45f3a2fdff9fc60577f2ab6 Task-number: QTBUG-51939 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Doc: Fix documentation about cookie storesKai Koehne2016-03-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove misleading "singleton, if one has been set" from the accessor's documentation. Also link to the accessor's from the class documentation, and remove mentioning of cookie store as something that can be accessed for an individual page. Finally, mark QWebEngineProfile::cookieStore as new in Qt 5.6. Change-Id: Ia20ca0ef45a9a15de0052f7ceb7f59d454c70fdc Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Fix crash when link opens a modal QDialog, using the trackpad.Alexandru Croitor2016-03-242-8/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a QWebEngine link is clicked on, and as a result a modal dialog is opened, a QEvent::TouchCancel without any touch points is forwarded to Chromium, which tries to access the first touch point position, and causes a QList assertion. Fix consists of two parts: 1) Make sure that no TouchCancel is forwarded, in case if no TouchBegin or TouchUpdate was issued beforehand. 2) Because QEvent::TouchCancel events might contain an empty touch point list, and Chromium expects at least one point, make sure to forward the last saved touch points (saved in previous TouchUpdate) together with the TouchCancel. Task-number: QTBUG-48661 Change-Id: I1eeb2980417b1b04e8387dc9f82f935ef2bd8f00 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix recentlyAudible Widgets and Quick API.Alexandru Croitor2016-04-084-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Rename all uses of wasRecentlyAudible to recentlyAudible. Add missing recentlyAudible properties. Change QtQuick slots to simple functions. Change affected demobrowser example. Adjust documentation for the API. Change-Id: I5a6f7b8384c0b7e34afaa5c412a5543c210d3ef9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Fix disabling spell checker supportPeter Varga2016-04-062-2/+2
| | | | | | | | | | Change-Id: I46805d8956815e4d691afd05a69ff16d6a86ad6b Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Document QWebEngineUrlRequestInfo enums as new in 5.7Kai Koehne2016-04-061-2/+2
| | | | | | | | | | | | Change-Id: I143c1ff7556777813387b664a59bafba1c9a3a58 Task-number: QTBUG-51808 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: New QWebEngineUrlRequestInfo::ResourceType valuesLeena Miettinen2016-04-031-0/+4
| | | | | | | | | | | | | | | | | | Add docs for ResourceTypeCspReport and ResourceTypePluginResource Task-number: QTBUG-51808 Change-Id: Id8b0f90f201670a927caf67e6cdff1ade211ebdc Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Use default language as default spell-checking languageAllan Sandfeld Jensen2016-04-011-1/+1
| | | | | | | | | | | | | | | | Instead of hard-coding en-US as the default, read the Qt default and use that. Change-Id: I118d2e7b9b4486dd32b2ccbd42c90bc1cee2257f Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Fix crashes due to qputenv being called after Chromium initialization.Alexandru Croitor2016-03-312-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qputenv() call inside gl_surface_qt.cpp, which is executed on a GpuChildThread, can reallocate the process environment structure, and it is possible that at the same time the main thread calls getenv, which will dereference a pointer to the freed environment structure, essentially causing a use-after-free crash. Make sure the qputenv() call happens before Chromium initialization starts, so no thread-race can occur. Change-Id: I4ecbdc8bf2abbe45f7d6c5d2633dc9fe27f51e66 Task-number: QTBUG-52124 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Add API for context menu dataAllan Sandfeld Jensen2016-03-302-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For QWebEnginePage users to be able to make custom context menu or extend the default context menu, they need information about the context. This patch adds a QWebEngineContextMenuData class that contains contextual information when a context menu is being requested. This is also means we can finally generate a custom context-menu in the demobrowser the same way we did in QtWebKit. Task-number: QTBUG-51079 Change-Id: I695b8cbf648bdc7f119b0ed51ab685cf2f8de8e4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add settings for FaviconManager's icon download modesPeter Varga2016-03-253-3/+19
| | | | | | | | | | | | Change-Id: I8e4b11089de29623ed39ec6b13fe30be734baa3e Task-number: QTBUG-51179 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Enable sandboxing for OSX and Linux.Alexandru Croitor2016-03-231-1/+14
| | | | | | | | | | | | | | | | | | | | | | Remove the --no-sandbox option when starting the Chromium render process and set --disable-setuid-sandbox, so that on Linux a SetUID sandbox is not used, because Qt WebEngine does not have a separate SetUID binary. Task-number: QTBUG-50708 Change-Id: Ibadfc6e25c89bd99ec8aa20dc15de4688c35d386 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Michael Brüning2016-03-223-10/+28
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-213-10/+28
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc Change-Id: I90728e965399e51b626d538924de955f9abab5fe
| | * Disable installation of icudt.dat for builds using system ICUKai Koehne2016-03-101-9/+16
| | | | | | | | | | | | | | | Change-Id: I71006b596b985acbfeec883d63de67959d0b8bdb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Initialize lazy base::CPU when IO are allowedIlia Kirianovskii2016-03-101-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should initialize base::CPU to get it a chance to read /proc/cpuinfo when IO operations are allowed. So it prevents the following error on ARM platform: ``` [0204/071425:FATAL:thread_restrictions.cc(38)] Function marked as IO-only was called from a thread that disallows IO! If this thread really should be allowed to make IO calls, adjust the call to base::ThreadRestrictions::SetIOAllowed() in this thread's startup. ``` In the same manner it is done in ChromeMainDelegate::PreSandboxStartup. Change-Id: I1facd9d856a8dbfdf03ddbb1ab8d76d2efe69050 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Flash: Support --ppapi-flash-version argument also for system FlashKai Koehne2016-03-101-1/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-51774 Change-Id: I609cfbd9304a396ab57c1479c7f4d3be8a379b94 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Pass minimum OS X SDK version used during Qt compilation, to GYP.Alexandru Croitor2016-03-221-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was hardcoded to 10.7 which caused two issues: 1) It's not the proper version anymore, the minimum required is 10.10.3. 2) In case if there are 2 SDK versions present on the host machine (eg 10.10 and 10.11), if Qt was compiled with 10.11, GYP would still pick up 10.10 as the minimum viable one for compilation. Change-Id: If815a81696d96a7d5f5f20464385235032b664c3 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Add option to allow compiling WebEngine as Mac App Store compliant.Alexandru Croitor2016-03-221-0/+1
|/ / | | | | | | | | | | | | | | | | When the option is enabled, a GYP variable is set that will result in removing private API calls in Chromium. Task-number: QTBUG-51072 Change-Id: If8835ce74bf5db94c17b68ebeb396cae9cc10553 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add callback to printing APIMichael Bruning2016-03-165-39/+110
| | | | | | | | | | | | | | Also corrects and updates the printToPDF docs to reflect recent changes. Change-Id: Iffe276a1046d6d55923939f9d72b97cd533017ff Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Allan Sandfeld Jensen2016-03-1111-7/+269
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-03-0811-7/+269
| |\| | | | | | | | | | Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc
| | * Configure MIPS architecure for gypAllan Sandfeld Jensen2016-03-031-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>
| | * 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>
| | * 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>
* | | Clean up FaviconManager and fix icon url in NavigationEntryPeter Varga2016-03-114-148/+75
| | | | | | | | | | | | | | | | | | Change-Id: I56a109c9071ef581c6a51b5b7b8ce5a2464c6a76 Task-number: QTBUG-51179 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | 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>
* | | Update to Chromium 49.0.2623.91Allan Sandfeld Jensen2016-03-091-0/+1
| | | | | | | | | | | | | | | Change-Id: I43c545d1600bebabf6b94209beb91b3d3c4cd244 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Use system protobuf if foundAllan Sandfeld Jensen2016-03-081-1/+1
|/ / | | | | | | | | | | | | 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-071-0/+1
| | | | | | | | | | | | | | | | | | 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-074-112/+14
| | | | | | | | | | | | | | | | | | | | 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-071-1/+0
| | | | | | | | | | | | | | | | | | 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>