summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make sure examples are always builtv0.1.0-tp1Simon Hausmann2014-01-231-0/+7
| | | | | | | | | | When building against Qt 5 release binaries, QT_BUILD_PARTS does not include examples. However we want to unconditionally build examples, until we become part of the Qt 5 module set. Change-Id: Ic51d105295797e80052e3808613fc16cec709773 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Fix package builds against release builds of QtSimon Hausmann2014-01-231-4/+25
| | | | | | | | | | | | The Qt build system assumes that when building a module against a release build of Qt, syncqt was already run at package creation time. So we have to run syncqt when creating source packages. This patch changes the syntax to separate the file name base from the package version to use. Change-Id: I48897d52a917194be6662a26268ad403883ed9e0 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Small fixes to the packaging scriptSimon Hausmann2014-01-231-2/+9
| | | | | | | | | * Add a .tag file to the archive that contains the sha1 the package was created from. This is useful for diagnostics. * Use bash and enforce error handling (it's easy to accidentally include bashisms) Change-Id: I8141b10d50bbf55a470d5a84ed0ae801742b57dc Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* RELEASE_ASSERT tweak.Pierre Rossi2014-01-233-0/+36
| | | | | | | Update the snapshot and add the patch that disables it. Change-Id: Ide67ab476d2fdc7afa0b361848a1ebe881235115 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix html5 videoAndras Becsi2014-01-234-1/+22
| | | | | | | | | | | Deploy the built ffmpegsumo library and make chromium find it by overriding the content::DIR_MEDIA_LIBS path with the deploy location. We deploy the plugin to $$[QT_INSTALL_PLUGINS]/qtwebengine. Change-Id: I0aeb37fccd2af62b23f8e6405041655e1f66b7aa Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Cleanup QtWebEngineWidgets headers for the TP1 releaseJocelyn Turcotte2014-01-1712-643/+49
| | | | | | | | | With this applications will get a compile error instead of a linking error for methods currently without an implementation in cpp files. Change-Id: I3fe5c1f127c57cd62a1eb401e8e3283e005a0344 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Qt Quick File PickerPierre Rossi2014-01-157-2/+158
| | | | | Change-Id: I6195c49f1647c78b16d9d47770ab37ba998a61a5 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* JS dialogs in QtQuickPierre Rossi2014-01-1520-27/+597
| | | | | | | | | | Refactor JavaScriptDialogManagerQt to support a Qt Quick dialogs friendly approach. Qt Quick dialogs are still missing a prompt, so we use a "handmade" one. This should be solved before 5.3 though. Change-Id: I965df66837b2e81d6e4618a8da1167a37661c26e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Pave the way for our UI delegation strategy.Pierre Rossi2014-01-1515-11/+697
| | | | | | | | | | | | | | | | | | | Starting with the context Menus for QtQuick. Add default UI delegates as a subproject. We allow ourselves to use Qt Quick Controls there for in order to get a nice "out of the box" experience for things like context menus, dialogs, etc while leaving the door open for system embedders to override this. Opting out of the deployment of these QML files is still very primitive but can be done by passing WEBENGINE_CONFIG+=no_ui_delegates at qmake time. Customization of context menus could be done via a qml component, which is probably best kept in experimental for now while we address its shortcomings. Change-Id: I0705b20d5ddd3bb010f9371b65a181c6b02a03e1 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* [Widgets] wire the file pickersPierre Rossi2014-01-1510-13/+137
| | | | | | | | | | | | | | | Introduce a new version of chooseFiles in QWebEnginePage. The existing API in WebKit1 seemed a bit dusty in any case (multiple only supported via extensions). Changes are: * oldFile becomes oldFiles, so that we could at a later stage expose the already selected files in the "multiple" case. * a type is introduced, for now limited to multiple selection, but over time, we might consider additions such as directory upload. Change-Id: I14cfea64ce95e892a0a1877c8cb914c5a421409f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix installation of most examplesSimon Hausmann2014-01-154-1/+7
| | | | | | | | | | * Make sure the example source code is installed * Make sure the installation path is consistent with the path within the module, to ensure that the sources end up next to the compiled binary. * Skip the widgets nano browser from the installation, as it's a developer tool. Change-Id: I35b421e12f8e6ddd3f2045e318b21543ff929cd8 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix placement of webengine processSimon Hausmann2014-01-151-2/+2
| | | | | | | | | In developer (non-prefix) builds, the binary goes to $$MODULE_BASE_OUTDIR/libexec, which is practically qtbase/libexec. In prefix builds it'll be linked to $module_toplevel/libexec and installed into $prefix/libexec. Change-Id: Ia42519f3113976e707fbda9e09dbf7ef6e235924 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Implement QQuickWebEngineLoadRequest classAdam Kallai2014-01-1511-11/+277
| | | | | | | | It contains information about a requested load of a web page. Change-Id: Ie45706adb51ee5bce98e7af01252d9a8389db57d Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Mac: Add QMAKE_FRAMEWORKPATH to compiler command line as well.Zeno Albisser2014-01-141-0/+6
| | | | | | | | This is necessary for the compiler to find include files following the "#include <FRAMEWORK/file>" syntax. Change-Id: Ia40b6bbe571e2b275a502c2de60cceeecc9b0f6b Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* README fixesPierre Rossi2014-01-141-28/+30
| | | | | | | | Separate the build instructions from getting the source. Also update some of the contents that were outdated. Change-Id: Ib0e02b69f616c0cd377a5f74df682542c21e49cc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Disable currently unsupported features in browser example.Zeno Albisser2014-01-141-6/+24
| | | | | Change-Id: I09ce8ad0372a80a2f19b95a2ba0a6fa8635debea Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Disable viewSourceAction in fancybrowser for now.Zeno Albisser2014-01-141-0/+2
| | | | | | | | This should be enabled again as soon as we have toHtml() implemented. Change-Id: I843112aa2778c05bbac9ab51f5427850a862f247 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Change init-repository.py to clone snapshot by default.Zeno Albisser2014-01-141-6/+6
| | | | | Change-Id: I48dda5ffd6f9a77a0e73bb9c6a62bfe8ebea5733 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix Qt5 libs linking to Qt5WebEngineCore.dll for WindowsZoltan Arvai2014-01-131-1/+2
| | | | | | | | | MSVC linker needs file extension, otherwise it searches for .obj files, but Qt has Qt5*.lib files. Change-Id: I4fd5e1d6001ea309da456c43ffc79cb5944a1ef3 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Fix ContentMain calling in processMain for WindowsZoltan Arvai2014-01-131-0/+11
| | | | | | | | | | ContentMain has a different parameter list for Windows. Currently no sandbox is in use, just fitting in with the required parameters. See chromium/content/app/content_main.cc. Change-Id: I6c3918efaafbf48bd4a07f377be51c22c5355cd0 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Add script to generate tarballs for releases.Zeno Albisser2014-01-131-0/+65
| | | | | | Change-Id: I14dbc2d4770cb0efe9a227e4f113e83c50e00283 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Minor correction of log message in qtwebengine_utils.py.Zeno Albisser2014-01-131-1/+1
| | | | | Change-Id: Id794add1267ebea804b050bb50e232bcf5f7dd13 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix RenderWidgetHostViewQt::GetCompositingSurface() on WindowsZoltan Arvai2014-01-131-0/+4
| | | | | | | | | gfx::GLSurfaceHandle needs reinterpret_cast for the first parameter to match an overload. Change-Id: I4b89c38b9694ab649e1e623049573675c926a4a7 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix WebEngineContext on WindowsZoltan Arvai2014-01-131-0/+4
| | | | | | | | | | | | AppendSwitchASCII won't accept WChars, it would need WideToASCII conversion. But on OS_WIN AppendSwitchASCII method only wraps parameters for AppendSwitchNative with ASCIIToWide. Doing ASCIIToWide(WideToASCII()) not seems to be a useful idea, so we should call directly AppendSwitchNative on Windows. See chromium/base/command_line.cc. Change-Id: I9733993840ddaef2dbb3176135977c39a967e381 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* init-repository.py should only be used when cloning with git.Zeno Albisser2014-01-131-0/+16
| | | | | Change-Id: I8df487f3abcdaae9303c8353b6a9f26c88bc6840 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Handle exception thrown by subprocess.check_output.Michael Brüning2014-01-131-2/+5
| | | | | | | | | The || true syntax does not work on Windows. Also, normalize the paths to the underlying OS style. Change-Id: Ie13d2646fe239fccb9ab7b558a6c8d56b779b206 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Disable Werror by defaultPierre Rossi2014-01-112-13/+4
| | | | | | | | | We don't want everybody to have to go and tweak ~/.gyp/include.gypi just for that purpose. Change-Id: I67533a62246dea45c4b5a5a454f43d01328d472f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix gpu::gles2::MailboxName on WindowsZoltan Arvai2014-01-111-1/+1
| | | | | | | | | | It is "struct GPU_EXPORT MailboxName" in chromium/gpu/command_buffer/service/mailbox_manager.h. MSVC won't accept class. Change-Id: I979808f357b32e1d99fe70a1138bf292b54c4e76 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Fix overrides for WindowsZoltan Arvai2014-01-112-1/+6
| | | | | | | | | | Add not yet implemented overrides to render_widget_host_view_qt.h. Remove ambiguous and unneeded override from browser_context_qt.h. Change-Id: Id1cac9bf811d8e128e5ba8df059f7ca3bdd919dc Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Little cleanup in take_snapshot.py scriptPierre Rossi2014-01-101-6/+0
| | | | | | | Removing some duplicate lines Change-Id: I92059eb42cedf5f912a595bbab4a73a1011d6dae Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix type conversion for WindowsZoltan Arvai2014-01-101-3/+11
| | | | | | | | | | MSVC uses WString instead of Utf16 so this needs different conversion in type_conversion.h. Change-Id: I987acb4ea5ad5a98c94fd992a9de05f602be825d Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix DownloadTargetHelper::determineDownloadTarget on WindowsZoltan Arvai2014-01-101-1/+1
| | | | | | | | | filePathForCallback.AddExtension won't accept const char[] with MSVC. It needs to be converted with the appropriate function. Change-Id: I95506de702eab4d7b61ddf051c7a122c793da35b Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Implement WebEngineError class for handling ErrorDomainAdam Kallai2014-01-103-0/+154
| | | | | | Change-Id: I6092483d46b8d0db6193b92f2744bd836beb4912 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Add placeholders for missing repack_locales switchesAndras Becsi2014-01-101-0/+4
| | | | | | | | | | | | | On some embedded setups and Windows unittest targets bring in new locale repack actions which use the -g and -b switches of repack_locals.py with @pymod_do_main. Since we did not implement these options the script execution failed. Add placeholders for these options. Change-Id: Ie11928b025448bc059fb1e3f2e695fb7698a7937 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Remove Q_UNUSED(uri) from webengine/plugin/plugin.cppAdam Kallai2014-01-081-1/+0
| | | | | | Change-Id: I403e7e3c89bd1881b96b1cc345ccdf115ceea5e9 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* quicknanobrowser: reset progress bar when reaching 100%Zeno Albisser2013-12-231-1/+1
| | | | | Change-Id: I146df83948017b5ad72e40d16a8cc7105691c309 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* createWindow QML API for QQuickWebEngineViewJocelyn Turcotte2013-12-235-21/+168
| | | | | | | | | | | | | | | | | | | | | | | | | This implements adoptNewWindow for QQuickWebEngineView. The API is only intended to be used through QML to avoid delegating the QQuickWebEngineViewHandle ownership through a signal parameter. Another limitation of the implementation is currently to fail the handle adoption unless it is done synchronously within the adoptNewWindow call. To support this we would need to delay the call to WebContentsAdapter::initialize which will leave the adapter without a client when returning to the event loop and would require putting null checks everywhere it is used. So I would prefer to keep the API limited and avoid potential crashes. If we want to support asynchronous Loader elements or QML files fetched from the network in the future, the API should be able to scale to the task once we've adjusted the implementation. This also adds basic tabs support in the quicknanobrowser example. The url property is now set imperatively to avoid overwriting the adopted WebContentsAdapter's loading URL. Change-Id: Iba5c5dc3ffa21045f356be131ca15c01b9aee7c8 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Make inspector listening port configurableXiaobo Wang2013-12-211-1/+14
| | | | | | | | | | | | Currently we use fixed port 1337 as inspector port. When weblauncher is launched by chromedriver it passes the inspector port as commandline argument --remote-debugging-port=<port>. Later on chromedriver will try to communicate with chrome via that port. We should use that port when starting devtools HTTP handler. Change-Id: I83e3341a535d50a129670bd0056b3ca448c8e2e5 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Fix the QQuickWebEngineView rendering with 1650.Jocelyn Turcotte2013-12-201-0/+12
| | | | | | | | | This is now initialized by Chromium in ContentMainRunnerImpl::Run, which we bypass for our browser process. Change-Id: Id8233df3fe12048cd2b6eaf870b161ab5d1eb089 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update chromium patches to apply on current stable (1650)Andras Becsi2013-12-2018-566/+179
| | | | | Change-Id: I3bdad02a2ef69d242980e34774a8219ef0c74ea9 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Improve init-repository.py to fetch up-to-date dependency listAndras Becsi2013-12-204-89/+306
| | | | | | | | | | | | | | | | | | | | | This patch introduces a new mechanism to retrieve submodules. The utilities in version_resolver.py provide means to download the upstream DEPS file for a specified Chromium version. This makes it possible to check out the needed svn branches and specific revisions used for the release. We still use the git repositories found in the upstream .DEPS.git file but since it is not regularly updated after the branch-off, we try to match the release svn revisions to git shasums which is possible since each commit includes git-svn-id's. Also add a maintenance tool get_version.py which reads the Chrome release information from http://omahaproxy.appspot.com. We now pin the latest stable channel Chromium release from branch 1650 with the version number 31.0.1650.63 and a branch-off date of Sept 23rd. Change-Id: I333ada4250999b442cd244821818bace9e6136f4 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Adapt to chromium API changes in refs/branch-heads/1650Andras Becsi2013-12-207-14/+17
| | | | | | | This patch also updates src/3rparty to the new snapshot. Change-Id: I56da8d795051a828d7b375e57c4dda8bc570229f Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Update take_snapshot.pyAndras Becsi2013-12-172-16/+73
| | | | | | | | | Add additional conditions to the blacklist function so that we include files needed for Boot2Qt-Android but exclude other files not needed for the build. Change-Id: I7cda448a943dc776ad6d29c872048cf256da599e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Avoid errors when closing the applicationJocelyn Turcotte2013-12-161-2/+9
| | | | | | | | | | This also fixes the crash on shutdown encountered when returning a TEXTURE_TRANSPORT GLSurfaceHandle from RenderWidgetHostViewQt::GetCompositingSurface. Change-Id: Ic92238907a3e7f9d0db4bf114269c1ca5cca5aa6 Reviewed-by: Arvid Nilsson <anilsson@blackberry.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix a crash when opening a window.Jocelyn Turcotte2013-12-161-1/+1
| | | | | | | | | | RenderWidgetHostViewQt::GetViewBounds gets called early than RenderWidgetHostViewQt::setAdapterClient when a new window is created by Chromium. Change-Id: I5ad61fc54ae773200403b222110a1d0ad541f941 Reviewed-by: Arvid Nilsson <anilsson@blackberry.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Revert "Improve init-repository.py to fetch up-to-date dependency list"Jocelyn Turcotte2013-12-164-306/+89
| | | | | | | | | Let's make sure that the submodule integration succeeds first. This reverts commit 584a8c3c637997fbb6772ab75aea1bd587b82a37. Change-Id: I972e5540031636489f0995ea864c4dcfc8e5cd7a Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Revert "Update chromium patches to apply on current stable (1650)"Jocelyn Turcotte2013-12-1618-129/+543
| | | | | | | | | Let's make sure that the submodule integration succeeds first. This reverts commit 6aa4bb60d7d10e50cb562756ef8210f559b35d1e. Change-Id: I5c9b81654296b3a8a240118f9af222b12dd2ecc4 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the utility process launching.Jocelyn Turcotte2013-12-131-0/+2
| | | | | | | | | | | | | This would cause a crash of the render process while loading facebook.com since the utility process would try to use /proc/self/exe on linux. Bring back the kBrowserSubprocessPath switch to specify our subprocess executable. Change-Id: I4822d43f4a2b5ee86b941721da5ebb47d7a97c5d Reviewed-by: Arvid Nilsson <anilsson@blackberry.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update chromium patches to apply on current stable (1650)Andras Becsi2013-12-1318-543/+129
| | | | | Change-Id: I3cd2ddc401e67c232c4bcc88d3c20252eece6be3 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Remove --android and download the android and mac files by defaultAndras Becsi2013-12-132-4/+1
| | | | | | | Later we can add 'win' here as well. Change-Id: I80ff9a2855b2a27e29146b2e6b30f55020f5de52 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 13:07:07 +0000