summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersJani Heikkinen2015-02-16286-2045/+2045
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ieb6bac7a1be5c25eb7cb917495b58b6a870ca6d4 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-02-144-11/+15
|\
| * Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-134-11/+15
| |\ | | | | | | | | | Change-Id: Ic4388b2c28f46ca8047061c049128672041ceb0b
| | * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-103-10/+14
| | |\ | | | | | | | | | | | | Change-Id: I484a058c08be04a87d2f84514193fb58e772246b
| | | * eLinux: build ffmpegsumo as well.v5.4.1Zeno Albisser2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will only contain free codecs. Change-Id: I021b2c121bf146abb24b7a90dd1c3580638b1058 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| | | * Also run the rejected signal handler when closing prompt dialogs.Michael Brüning2015-01-201-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prompt dialog inherits ApplicationWindow, which emits the signal "closing" when the window gets closed by pressing the X button. Change-Id: I23e5cf6f8e81251869d765d7fd2864257f3c0b89 Task-number: QTBUG-43902 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| | | * Merge 5.4 into 5.4.1Oswald Buddenhagen2015-01-1613-38/+145
| | | |\ | | | | | | | | | | | | | | | Change-Id: I772c9710d8b01efd385a54e5f642ae2b62702a0e
| | | * | Fixed build when doing arm cross compilation without --sysrootDominik Holland2015-01-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise gyp will use it's own sysroot (which doesn't exists) if you are doing a croos-build without using the --sysroot configure option Updates the src/3rdparty SHA1. Change-Id: I450eaf95c50b3cf5dd2ad553bd363481def511fd Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| | | * | Respect the pulseaudio configuration from Qt.Michael Brüning2015-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was previously ignored for Desktop Linux. Change-Id: I214171d222a5e7e0ee64afde225a742adbda4adf Task-number: QTBUG-43387 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| | * | | Ensure QtWebEngineProcess is built in release modeAndy Shaw2015-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If debug_and_release is set then QtWebEngineProcess should be built in release mode as it is a separate process and when it is deployed later it will be in the right mode already. Change-Id: I377baa20f01b70db91a7a1cec5f1014b44780546 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | | | Compile time check the fileListingHelper specializationsPierre Rossi2015-02-131-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we can now rely on deleted functions (supported by MSVC 2013), we can avoid the scenario we had with the last snapshot update where the file picker internal API changed slightly (see 1a744ca4 for more details). Change-Id: Iab26a7834a367f24afe5fbf37fae64639aa9c12e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | | Move webChannel property out of experimentalPierre Rossi2015-02-134-15/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a notify signal to go with the setter. Parent the default-provided channel to the view. Comes with basic documentation. Change-Id: I2bde8153df5928fc92ac36b7fa4d4b3b1da22f53 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | | Add QWebChannel setter and getter to QWebEnginePagePierre Rossi2015-02-132-0/+35
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows using the WebChannel integration from the widgets API. Contains documentation, the underlying API for transport is tested by the qml tests already. Change-Id: If5520eddf5d1a9c917df890960e042f53baa42ce Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Integrate with WebChannelPierre Rossi2015-02-1217-14/+601
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a transport mechanism for WebChannel over chromium IPC and expose WebChannel in our experimental QML API. Co-authored by Milian Wolff. Change-Id: Ia24b1d4ebc8515de677d4849ec33cb55c963918e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Add static asserts for internal file picker enumPierre Rossi2015-02-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Keeping it in sync with its content equivalent. Change-Id: If0dbd79844b836ee8fe26b1e9c414f355c026302 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Forward the application locale in the right formatPierre Rossi2015-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium expects bcp47. Change-Id: I0403fe38e431bbc184d833009e9343235dc543d9 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Improve quicknanobrowser example with new public API featuresAndras Becsi2015-02-096-14/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Promote WebEngineDownloadItem and WebEngine singleton to public API and add DownloadView to the browser example. This patch also adds profile support and webengine settings to quicknanobrowser. Change-Id: Ie81fb330e640fad7feec667a8af3afe67050693f Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | Proper versioning of the Quick APISzabolcs David2015-02-063-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add missing "REVISION 1" to the new parts of the API: zoomFactor, certificateError and profile. - setZoomFactor should not be a slot. Change-Id: I02551ee7eb7323ff8dbb0b62ea503ed08b2051c2 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Reverse the logic for download cancellationAndras Becsi2015-02-064-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we require downloads to be explicitly accepted we should have 'accepted' as a member in the download info instead of 'cancelled'. Change-Id: Ia8ff4a4b29f3c8631f4cb1c410ece5f11d9cdc93 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | | Update QML download API to match widgets and add documentationAndras Becsi2015-02-069-62/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the download signal to downloadRequested and only start a download if it has been explicitly accepted by the user, else cancel it by default. Replace the downloadPercentage property with totalBytes and receivedBytes to also give the user information about download size. Additionally this patch adds missing documentation. Change-Id: I9d895386cf033f2efffe3ebac6f08f94c6fe0c19 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Jocelyn Turcotte <jturcotte@woboq.com>
* | | | Revert the QJSValue parameter type in UIDelegateAdam Kallai2015-02-061-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mapping of var signal parameters to QJSValue was reverted in qtdeclarative, commit 605777e6cf557dbaf2835c63562bf3fe1620ee45. Change the FilePickerController::accepted() slot parameter type from QJSValue to QVariant in UIDelegate. Task-number: QTBUG-44307 Change-Id: I373b37b6eb4c32e91fd92701ecad685eab9cb804 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | Fix the fileListingHelper template function specialisationAdam Kallai2015-02-061-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WebContentsAdapter::filesSelectedInChooser function parameter type has been changed since the Chromium update. Thus content::FileChooserFileInfo has to be used instead of ui::SelectedFileInfo. Change-Id: Ia6a50409f3f7c704228cb739fc50d694e633dbee Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Move settings out of experimental.Michael Brüning2015-02-065-10/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: Ida74680a4180f4366746874a656041364563d548 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Fix multi-tab browser quit action on OS XAndras Becsi2015-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo '=+' -> '+=', that prevented us from properly counting the open tabs on OS X. Change-Id: If6bbe8cbcf83d7ee8a4e11361a2199b51430700b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | Fix Back/Forward menusPierre Rossi2015-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used private API from controls, knowing the risks, and indeed, the API changed... Change-Id: Ieb6ae01f4fddbef09240b637012c3b3dfef4b049 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Simplify access to WebContents from adapter.Pierre Rossi2015-02-053-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I42cc8b28dd9aef9d23b83a43a60d8d59c16f4b1d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Revive the widget Browser's DownloadManagerAndras Becsi2015-02-058-240/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reenables the widget example Browser's download code by porting it from the QNAM-based QtWebKit API to the new download API of QtWebEngine. Change-Id: I0630c76902fb30c355c774664f0a2005fe29023c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | | Add settings to WebEngineProfilesAllan Sandfeld Jensen2015-02-0519-383/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds settings to profiles so common settings might be shared among all pages in a profile. The former global settings are now replaced by the settings of the default profile. Change-Id: I544420e07beeb52ef29b2360bc7929402650cd07 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Propagate unhandled key events to the QtWebEngine view's parentJocelyn Turcotte2015-02-0514-9/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows applications to receive unhandled key events from the page by setting an event handler on the view's parent widget/item, like it was possible with QtWebKit. This is different in that events first have to asynchronously go through the QtWebEngineProcess. If the WebEngine view has the keyboard focus, the events will be consumed inconditionally by the RenderWidgetHostViewQtDelegates, and a copy will be resent to the view's parent if it wasn't consumed. This sends it to the parent instead of the QWebEngineView directly since those are only unhandled events, unlike with other widgets where you can first intercept events. It is done that way also in cases where the QWebEngineView would be be the focus widget directly in the future, instead of the RWHV. If applications want to intercept key events before they reach the page, they need to use an event filter on the QWebEngineView's children or globally on the application. Change-Id: I3b48f5212d3f238a1c0497cec1db6ae3badbad26 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Handle multiple feature requestsAllan Sandfeld Jensen2015-02-044-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes it possible to have multiple outstanding feature requests and adds hooks for chromium to cancel requests. Change-Id: Icbeb30aa39ace090d853a29aefaeebbe726fe251 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | Update snapshot sha1Peter Varga2015-02-031-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Iac92ae93480b4704fe7e40588ff8b3d46ea09b89 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Fix widgets download state updateAndras Becsi2015-02-023-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the DownloadState enum of core does not match the DownloadState enum of QWebEngineDownloadItem we should never directly compare it, instead we should convert with the toDownloadState() function, to fix the missing emission of the finished() signal. This patch also adds static asserts to verify the match of chromium's DownloadItem::DownloadState and our core DownloadState. Change-Id: I51110f55598230e380e15948f75219976d3a68a0 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | Forbid mismatching profiles when adopting web contentAllan Sandfeld Jensen2015-02-024-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid crashing due to a mismatch of browser-contexts used by webcontent and webcontent adapters and clients, we refuse to open content in a new window witha different profile and prints a warning so the developers may fix their software. Change-Id: I704266a96de2d7a5f8e1fa3ccf49a50f1d2307c9 Task-number: QTBUG-43898 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Add widgets download APIAndras Becsi2015-02-027-2/+580
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a QWebEngineDownloadItem class to the widget API and extends QWebEngineProfile with a signal to notify about initiated downloads, similar to the QML API. [ChangeLog][QtWebEngineWidgets] Add widgets download API Change-Id: I532de640934e1e93d63dfc347efb4113cb4a3d66 Reviewed-by: Jocelyn Turcotte <jturcotte@woboq.com>
* | | | Add Qt WebEngine Quick API for allowing certificate errorsPaulo Pinheiro2015-02-0218-16/+371
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds API for overriding some certificate errors. Once overridden any identical error for the same hostname and certificate will use the same override. Change-Id: Idf9e968edca18751cbdab744880480750d0c1bd4 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* | | | Bypass the C++11 check for Visual Studio 2013.Michael Brüning2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio enables the C++11 features it supports by default without using the QT_CONFIG logic. Change-Id: Ifcd9ae230a081783256c99183c10fc8295c014cc Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | | | Fix the build of tst_publicapiJocelyn Turcotte2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If703ff2e5d8fd8ebfe92ad1ac3603c1abe5c7e53 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | | | Rename HttpCacheMaxSize to HttpCacheMaximumSizeAllan Sandfeld Jensen2015-01-292-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rename was only done in QWebEngineProfile but is missing in QQuickWebEngineProfile. Change-Id: Ib90d075fe3f4ddf5dbc7e22861d8e76574abb8dd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | Document geolocation featureAllan Sandfeld Jensen2015-01-282-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the geolocation feature was activated, the feature request was not documented along with it. Change-Id: I8cb1b60015c3cffe7f3d035ea4f61625d81be5b0 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | | | Update the expected list of public API testcaseAdam Kallai2015-01-282-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also fix the qtwebengineglobal_p.h header include in quickwebneignedownloaditem_p.h, because it is searched for wrong manner from the tst_publicapi testcase. Change-Id: I8997fafbf198f19a3d54b194f3408def6370417e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | | Handle Shift, Ctrl and Alt key also when the keypad modifier is set.Michael Brüning2015-01-281-303/+310
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When pressing one of these keys while already holding a keypad key, the keypad modifier was also added to the second key presses at least on OS X, leading to the key presses not being handled correctly. Includes minor coding style adjustment as well. Change-Id: Ia5c5af43256adf6cb4a97541351fee93bec08458 Task-number: QTBUG-42124 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | | | Document QQuickWebEngineProfileAllan Sandfeld Jensen2015-01-271-0/+101
| | | | | | | | | | | | | | | | | | | | Change-Id: I63621cec0f307fc3c0e71c84f99c68c0372d2992 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Add .pch and .obj directories to .gitignoreMichael Brüning2015-01-231-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I22ff2a3fc8ba3b25aceb6d11ce2e1093afef8f1e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | | [Windows] Enable WebGL and accelerated 2D Canvas.Michael Brüning2015-01-231-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we are using Chromium's SW compositor when using an ANGLE-based Qt build, it should be safe to re-enable those. Change-Id: Ib87ef38a5a381a389fef7e092328c9c5d116aa4e Task-number: QTBUG-42182 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | | Move newViewRequested to the public APISzabolcs David2015-01-2316-27/+317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the API to public, with proper versioning, adds documentation and adjust the warning to also report an null parameter to openIn that would cause the load to fail. The experimental example code is copied from quicktestbrowser to quicknanobrowser. Change-Id: I23b06c7a5add0323d0540a783873584438d85ea8 Reviewed-by: Szabolcs David <davidsz@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Fix the new window example code GC problemsJocelyn Turcotte2015-01-236-21/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we want to allow destroying the main window, we need to also create it dynamically. Use an intermediate root QtObject to take care of this. Change-Id: I04ba2ac7b1a24ea75ee1eecc3ab9157e8645ab30 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Clean the file structure of quicknanobrowser and quicktestbrowserJocelyn Turcotte2015-01-2314-315/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove the unnecessary intermediate ApplicationEngine class - Rename quickwindow.qml to BrowserWindow.qml - Move the injected Utils QObject into utils.h Change-Id: I3b0551e2bf477fc94640c71736de26c46c1ab633 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Enable building Qt WebEngine without accessiblity enabled.Michael Brüning2015-01-2318-6/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds guards that for QT_NO_ACCESSIBILITY being not defined around the code that uses accessibility types. It disables the quicknanobrowser and quicktestbrowser examples which need Qt QuickControls, which has a hard dependency to accessibility being enabled. Task-number: QTBUG-43305 Change-Id: Ifa39e3ce447ebc2124f52e00b29b1d7d2231035e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Introduce ASSERT_ENUMS_MATCH macroPierre Rossi2015-01-224-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For our common use case of compile-time checking enums that we want to keep in sync. Change-Id: I102d737ad986bf3dfff4d11a91afa3f3819a7947 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Improve geolocation permission securityAllan Sandfeld Jensen2015-01-223-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure we only grant permission to the origin the user replied to, otherwise we might get a race exploit. Change-Id: I4f737148f4e41432c160b81c324531e9cde0edc6 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 21:06:12 +0000