summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Create application bundles for widget examples on OS XAndras Becsi2015-02-264-19/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not remove app_bundle from CONFIG and update the Info.plist file for the Browser example to have the correct resolution on retina displays. This patch also updates the snapshot sha1 to include localization patch and one that removes a additional duplicate lower-case header file that was causing problems during source packaging. [ChangeLog][QtWebEngineWidgets][OS X] Fix example on retina display Change-Id: I682d41ca13d33ec06837ad862924382f4236d76c Task-number: QTBUG-44633 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update Chromium to include fix for constants.h/Constants.h clashSimon Hausmann2015-02-261-0/+0
| | | | | | | | | | | | Change-Id: Iabe2fc6ca1b3f989c16bed05f602273b146d17c6 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Add config test for Khronos development headersAndras Becsi2015-02-233-1/+48
| | | | | | | | | | | | | | | | | | These are needed on Linux, since the core layer can not rely on the shipped third_party/khronos headers because that would break the build on GLES configs. Change-Id: I598f58a9830b31a56425db60b7fc36c3f34f8581 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | QtQuick API for userScriptsPierre Rossi2015-02-229-0/+469
| | | | | | | | | | | | | | | | QObject-based, allowing the same things as the Widgets API in a declarative fashion. Change-Id: I9c9819b691b2098ec47e0536d47ccd2a950126c2 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Introduce a user scripts mechanismPierre Rossi2015-02-2128-11/+1679
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allowing programmatic injection of JavaScript to accomplish all sorts of tasks on the render process side. This API gives control over the point during the loading phase at which the script is run, whether it is run on sub-frames or not, as well as the JavaScript world it is run in (either the page's main world, or an arbitrary isolated world). This only has the Widgets API. The Quick API, tests and docs are coming in separate patches Change-Id: Ia1c79f68f8dfd4d964281d9723d09062ed7abe46 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Synchronize with QAtomic instead of volatileAllan Sandfeld Jensen2015-02-202-28/+26
| | | | | | | | | | | | | | | | Replaces the three volatile bool with two atomic ints and an atomic pointer. Change-Id: Iad41aef4952bbf7de77523ffd729bd00ace68ee9 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Fix crashes and ownership issues in Custom URL scheme handlingAllan Sandfeld Jensen2015-02-207-14/+16
| | | | | | | | | | | | | | | | Fixes crashes exposed by implementing the qthelp protocol handler for Qt assistant. Change-Id: I0b1153bc52ff82838cde009f1fe1ac46edc43210 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Fix the build on eLinuxAndras Becsi2015-02-209-33/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | Update ozone layer to the new snapshot, update the embedded_linux.pri configuration, fix the GLSurfaceQt build on non-x11 linux and update embedded command line switches for the 40.0.2214-based chromium snapshot. This patch also updates the snapshot sha1 to include required chromium changes. Change-Id: I7f9446fa1b67a0af7baee564acff41ae33ff1a94 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-02-201-3/+2
|\ \ | | | | | | | | | Change-Id: Idb0ac6490d6faf843acccc11ce68604a878d9ecd
| * | Call default_pre before using its resultsFrederik Gladhorn2015-02-191-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | To check the XCode version, default_pre has to be run first. Under most circumstances the order is not important since the value gets cached, that's why current builds usually work. Change-Id: I2613e92189592d7b25200e22a378f9f593b5057e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Update QtWebEngine version to 1.1 in the testsSzabolcs David2015-02-1922-22/+22
| | | | | | | | | | | | | | | Change-Id: Ie5c484540e5a46adec7f4e50cb63bc31d854a8b9 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Experimental custom URL scheme APIAllan Sandfeld Jensen2015-02-1921-1/+1057
| | | | | | | | | | | | | | | | | | | | | | | | Introduces API for custom URL scheme as an experimental API in widgets. A QML api is not included yet. Change-Id: Ice4542e5238feb961a4c9c60a809455e31dc1ec6 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | WebChannel: don't mess with the navigator objectPierre Rossi2015-02-195-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The navigator object is actually exposed later on from WebCore using a different mechanism, so the V8 extension approach won't work with it. Better take the chrome extensions approach and expose our own. This should "un-break" the part of the web that was broken by eee482929a. Change-Id: I991be2e12bb9ebcf60ace02721497c3fcd923c7f Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Fix tst_qwebengineaccessibility API testSzabolcs David2015-02-182-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement a custom QTEST_MAIN preprocessor macro in order to support hardcoded Chromium content switches in the API tests. Force renderer accessibility to be on instead of enabling it on demand when a screen reader is detected. Change-Id: I9600ac4b26f4656104ce27ff19accbed4ea817c6 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | | Move navigationHistory out of experimentalPierre Rossi2015-02-1811-48/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an offset role to the models. Implement goBackAndForward that uses this offset. Also add a complete model, items, that includes current navigation entry (at offset 0) to allow for the Firefox-style single menu, and add that one to the nano browser example. The models are now instantiated lazily as it's unlikely the three models will be used by the same app. Change-Id: Ib551738611497c7eb9c501f045cda315968a2ada Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Fix Http User-agent string settingAllan Sandfeld Jensen2015-02-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium has multiple places where it reads the user-agent, we were only setting one, which appears to no longer be used for most cases. This instead sets it by using the webcontent user-agent override. Change-Id: I77d4d0a21424feda7a18140fb72baacdd6f816ca Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 10:47:53 +0000