summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Use the same version scheme as other Qt modulesJocelyn Turcotte2014-09-112-11/+1
| | | | | | | | | | | | | | | | After trying to get rid of all private header includes, the last standing one is qplatformnativeinterface.h even though its name previously suggested that it isn't private. This would be a complicated piece to expose publically in a way both flexible and binary compatible, and is a task heavy enough to justify committing to follow Qt's release cycle. The QML import version remains to 1.0 and will be incremented the same manner as QtQuick itself does. Change-Id: I6fab5f229d9f79dbc7a3e82d65ad324020929863 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Remove unnecessary private header includesJocelyn Turcotte2014-09-1111-14/+10
| | | | | | | | Most importantly, get rid of QOpenGLContextPrivate::globalShareContext which will be removed before the final. Change-Id: I5796fa822d2962c21fd8b6d8d3c196686d536e3d Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* init-repository: clean up upstream repository checkout even moreAndras Becsi2014-09-113-47/+23
| | | | | | | | | | | | | | Remove unneeded codepaths now that we can trust the git shasums found in the .DEPS.git file. No need for parsing and verifying remote branches, we can simply fetch the specified sha1 from origin. This patch also unifies the 'shasum' and 'ref' members of the Submodule python class since the 'ref' member can represent both chromium's version tag and the sha1s of the submodules, there is no need for a separate codepath for these. Change-Id: I1300b5b74f4d2e6984943570963b2f813b1b1679 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* take_snapshot: check if dos2unix is in the path before using itAndras Becsi2014-09-111-2/+6
| | | | | Change-Id: If696de316dd7b3b801ba46d1a54c37eafa901bf1 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add --log-level switchPeter Varga2014-09-111-0/+17
| | | | | | | | | | | | | | | | | The --log-level switch sets the log level of the chromium messages. It affects the browser and web processes but has no impact on the Qt messages. The following levels can be set: 0 -> LOG_INFO 1 -> LOG_WARNING 2 -> LOG_ERROR 3 -> LOG_FATAL Log level 3 set per default (fatal messages are shown only) since lower level messages might be irrelevant for those who use QtWebEngine API. Change-Id: Ie2ba10718d3c86bbfe3d847471b3facb346be446 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the type of argument in FilePickerController::accepted() slot.Adam Kallai2014-09-101-6/+8
| | | | | | | | | The filesSelected QML signal is connected to FilePickerController::accepted slot but the type of the parameters were different. Change-Id: I36a33857b557797fc18699144c4d558d0e454cf8 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Do a minor update to Chromium 37.0.2062.103Jocelyn Turcotte2014-09-103-1/+3
| | | | | | Change-Id: Ie9334cc9cdd240b2f5ceea0e31d82258045ea18c Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Run dos2unix on all files when taking snapshotsJocelyn Turcotte2014-09-101-7/+24
| | | | | | | | | | | This fixes Qt's packaging scripts that use the --to-crlf switch of zip, which doesn't work when files already contain CRLF. The script now takes much longer to run and a progress indicator was added to the console. Change-Id: I459c0d95f67b40ab57ff3b337210847cc60debc7 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Prepare scripts for the .103 snapshotJocelyn Turcotte2014-09-102-60/+6
| | | | | | | | | | | | Chromium is now relying on git for its releases and isn't creating release DEPS files anymore. This patch makes sure that we ignore any deps not starting with src/ to exclude the script repositories outside of the Chromium sources and it removes all the svn-related logic. Change-Id: I24b1839f919821382b8c5993c71251dbd6108d4f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Clean up the module root directoryJocelyn Turcotte2014-09-102-110/+5
| | | | | | | | | | | | This moves init-repository.py to tools/scripts since it should now mainly be used by Qt WebEngine developers after our integration with qt5.git. Also remove the README file since most of the information is no as relevant for the Qt module audience as it was for a labs project. Change-Id: Iad9f6582d0ec0834cdaf38d0551d24f2c273badf Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* flag submodule for automatic cloning by init-repositoryOswald Buddenhagen2014-09-101-0/+1
| | | | | Change-Id: Iaa7439c759739a5bd2f1fbd10529c15e83497ecf Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix tst_QWebEngineFrame::progressSignal API test caseSzabolcs David2014-09-093-5/+4
| | | | | | | | This test fails, because we get two loadProgress signals with the 100 value if the page load is successful. Change-Id: Idbd68c28ba81f8ff0a5b1d98aece82e7a940f1b9 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Generate moc and rcc files in the gyp build directoryJocelyn Turcotte2014-09-081-10/+12
| | | | | | | | | | | | | | | | | | The real problem that this patch fixes is that moc and rcc generated files are added to the gyp sources variable with an absolute path, which for some reason triggers gyp to place the output file in the same directory as the source instead of the Release or Debug directories. This causes the last compiled file to be shared by both the release and debug builds when building debug-and-release, and MSVC will fail linking if the linked files have incompatible CRTs. This patch fixes the issue by moving both the generated cpp files and their compiled objects under <(SHARED_INTERMEDIATE_DIR), which points to (Release|Debug)/gen. Change-Id: I4143340acf56c3c7ed665aaae8f6221c310aafa9 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Bump the Xcode minimum version to 5.1v5.4.0-alpha1Jocelyn Turcotte2014-09-051-1/+1
| | | | | | | | | Upstream Chromium hasn't been building with the version of clang available in Xcode 5.0 for a while and we have to disable the build until we see a benefit to maintain this build environment. Change-Id: Ia91844dc7f3be1b1623610be417409d0d065c623 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Split QMAKE_FRAMEWORKPATH in case there are multiple paths.Zeno Albisser2014-09-051-1/+1
| | | | | Change-Id: If391781604861961387019ea15e9c29b6a1e3e1a Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Fix url stored in LoadRequestPeter Varga2014-09-056-18/+19
| | | | | | | | | | The test_urlProperty() qml test has failed because the active url was stored in LoadRequest in case of LoadFailedStatus. With this fix the loadRequest stores the url of that page which implies the request. Change-Id: I6aab814a4a7d3b47043b03fccde3d9995b40d8fa Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* [Win64] Do not skip 64 bit builds on Windows.Michael Brüning2014-09-051-11/+2
| | | | | | | | Chromium has enabled this in the 37 based branch and it worked with Qt WebEngine as well. Change-Id: Idb1f9a2133be645cd044c9f0163cc87f6ae8e474 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix an assertion in net/url_request/url_request.cc:656Andras Becsi2014-09-051-3/+1
| | | | | | | | | | | | | | Instead of cancelling the request we have to set error to net::ERR_ABORTED since URLRequest::BeforeRequestComplete enforces not receiving cancelled requests with an assertion. Our API requires the symmetric LoadStarten - LoadStopped signals even on an ignored request so cancelling the request and returning early would not be a solution, since it would not emit any LoadStopped signal. Change-Id: I1b13fe6520121805bcf420e810999c520c12bd5c Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* [Win] Fix compiler error by using toQt method for string16.Michael Brüning2014-09-031-1/+1
| | | | | Change-Id: I3412c8e7315020f517039290b03282513569ef2d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Hardcode the module version to not confuse syncqt.plMichael Brüning2014-09-031-5/+1
| | | | | | | | | syncqt.pl uses a combination of echo and sed to retrieve the module version. It cannot run qmake, which would be necessary for evaluating the version dynamically. Change-Id: Ibdd95da5dc26edf18f005ab7f82e83136acd795e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* [Win] Add gnuwin32\bin directory to PATH.Michael Brüning2014-09-031-0/+5
| | | | | | | | | This is necessary for finding gperf, bison, yacc, etc. on Windows. Works only if the gnuwin32 directory is on the same level as the qtwebengine root directory, which is the case with a qt checkout. Change-Id: I09fe1523d4e4baca6612f1039bbba2e2ff9d87c0 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update src/3rdparty to include fixes for the alpha packagingJocelyn Turcotte2014-09-031-0/+0
| | | | | Change-Id: I048ffb55c6205373aa7c5a7e0a3d9e824415b379 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Don't forward loading of error pages to the API layerPierre Rossi2014-09-0211-20/+48
| | | | | | | | | | | | | | | | | | The fact that the error pages are HTML and get loaded through the same mechanism should be kept an implementation detail and not be considered as a new load in the API sense. Also implement HasErrorPage for good measure and remove an anoying warning from the demo browser. The issue of the url not being changed remains in the QML test (but it doesn't affect a typical browser-like UI since the user input is still there untouched in the address bar), just make sure that failure does not affect the later checks. It also seems like we have a focus problem somehow, but the test should probably use a click for that matter. Change-Id: Ib5e363981a11287fdf4bfe84b93c999d96ed8087 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Settings in test browserPierre Rossi2014-09-021-0/+27
| | | | | | | | Expose some "testable" settings as well as test the integration with the QML Settings API. Change-Id: I7ec6a7e695f60338b2c16a648e9a93b64ea29a94 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* [Win] Enable multiple processes again.Michael Brüning2014-09-021-2/+0
| | | | | | | This seems to work well with the Chromium 37-based snapshot. Change-Id: If7640bf7f2428db12eb2bd01707ef82df9014cf2 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Settings for Qt quickPierre Rossi2014-09-0211-24/+562
| | | | | | | | | Expose settings in experimental for now. Simply use the global/per-view mechanism as a group level in between seems like overkill. Change-Id: I7610e9c7765ccb41674702acdd24a52b87716da8 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Try harder to return accessible namesFrederik Gladhorn2014-09-013-19/+136
| | | | | | | | | Always check if there is another accessible set as title for the one queried. For text fields also return the placeholder property if nothing else is set. Change-Id: I3f10ff04338a405ad8de00e75e15dded4aaeed3b Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Revert "Revert "Improve roles""Frederik Gladhorn2014-09-011-33/+70
| | | | | | | | This reverts commit 0540dc569e5761378182485aadf4c91641f67d56. The change in qtbase is in and qt5.git has been updated. Change-Id: I6c44d2d8316e4f05a4f480ed276967d026c7a130 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Avoid duplicating timers in MessagePumpForUIQtJocelyn Turcotte2014-09-011-7/+19
| | | | | | | | | | | | | | Since DoDelayedWork always returns the time of the next delayed work to process, we would create a new timer for the same event every time we process an event. This would cause a timer starvation on Windows for example. Instead of blindly creating timers, keep track of the requested delay and create a new timer only if the new delay is shorted than the currently scheduled one. Change-Id: I2606231f0a48b8feb85f058a78eb772d26b222f3 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Support using MessagePumpForUIQt in standalone base::ThreadsWebKit Team2014-09-011-3/+10
| | | | | | | | | | | | | We currently assume that MessagePumpForUIQt will only be used on Qt's GUI thread but OSX and Windows do have some cases where TYPE_UI is used for non-UI threads. This currently causes asserts in debug on OSX since the DNS thread quits prematurely. Instead of overriding all those edge cases to use TYPE_DEFAULT, properly support MessagePumpForUIQt::Run by using a QEventLoop. Change-Id: Icdb65966867ca6fd3679c75a698007f63848babc Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Wait on sync point fences instead of creating a new fenceJocelyn Turcotte2014-09-015-71/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | Posting a runnable on the GPU thread's message loop and creating a GL fence sync there assumes that there is a current GL context, and that synchronizing with this context will make sure that we wait for all GL context producing any of our consumed texture mailboxes. This is however not always the case like when: - The current GL context on the GPU thread is destroyed right before our runnable is handled, displaying errors on the console that glFlush needs a current context. - The GL driver will do extra scheduling and let the scene graph thread synchronize its GL command stream only with the GL context in which the fence sync was created. To remedy the situation, make sure that Chromium creates a fence sync for every sync points associated with a mailbox that we consume and do so directly in the GL context associated with the originating glInsertSyncPointCHROMIUM call. Wait for all those syncs on the Qt side afterward. This might also help with a few erratic behaviors noticed on some embedded GL drivers. Change-Id: I5fc60fcf51497477b2e1b3a535d0a141954fc6e5 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* React to Accessibility being enabled/disabled globallyFrederik Gladhorn2014-09-012-2/+16
| | | | | Change-Id: I57a85682d132bfefcdb0e3d1b3065f0474317e32 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix crashes when running in debug on OSXJocelyn Turcotte2014-08-291-3/+0
| | | | | | | | | | | | | | | | | | When building debug-and-release, only the release version of core_generated.gyp, defining NDEBUG, would be generated by gyp_generator.prf. Both the debug and release ninja files would be generated by gyp from that same file and we would end up defining NDEBUG for src/core source files even in debug while the rest of the content layer would be properly built without it, causing crashes with object having unexpected sizes and non-symetrical clean-up routines. Skia doesn't seem to complain anymore if I build in release without this so simply remove it. Change-Id: I021f87f2dac5aa21831992824d39dc44216b5f58 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add Qt WebEngine Widgets API for allowing certificate errorsAllan Sandfeld Jensen2014-08-2919-0/+617
| | | | | | | | | | | This adds API for overriding some certificate errors. Once overridden any identical error for the same hostname and certificate will use the same override. Similar API for QtWebEngine QML should be added in a later patch. Change-Id: I144147b86d9b592e3f87346a1e48890acee0c670 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix callback mechanism in the WebContentsAdapterSzabolcs David2014-08-281-6/+6
| | | | | | | | When we dispatch a request, we register it's callback with different ID in the QWebEnginePagePrivate. Change-Id: I1fa1f778de66fbedbd6cce35f6c823d5640dbe5e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Cleanup use of QJSValue::engine()Pierre Rossi2014-08-281-1/+2
| | | | | | | | | | Not only this causes warnings because it is deprecated, it lead to a crash in our QML tests when the callback fails to return a valid engine instance. Change-Id: I9412f138f87c39fbee8dbb6121a5bf0a69dcfbb4 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update license headers.Pierre Rossi2014-08-285-71/+47
| | | | | | | | Because the files were recent additions or for other unclear reasons, not all the files were updated to reflect the license change. Change-Id: I6898f6f4f993f1efa9489382f0b94af285f8c4f5 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* [Win64] Make sure ninja is built in 64bit mode as well.Zeno Albisser2014-08-261-1/+5
| | | | | | Change-Id: If1665b5bb7a6db07ca737aa00d0ddba964e418aa Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* When comparing paths in python we have to use normcase.Zeno Albisser2014-08-262-5/+5
| | | | | | | | | | | | Chromium requires relative paths for output-dir and for generator-output. Also output-dir is expected to be a subdirectory of generator-output. This now allows building on windows without running qmake in recursive mode. Change-Id: Ie0f9965c1fbfd63eb3cb9c360b29f210128a5c3e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Enable 64 bit builds on Windows.Michael Brüning2014-08-261-0/+5
| | | | | | | | Ninja needs to have an _x64 appended to the configuration in order to build the 64 bit targets on Windows, as opposed to Linux and OS X. Change-Id: Idc9888c9f80ccb27d26fb86588ed39fba92a2c71 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Doc: Added some links among the pages.Jerome Pasion2014-08-262-1/+11
| | | | | | | | -increases visibility to those pages. Change-Id: I6b776157eee991907c8e2bc16c63df90a85663a3 Task-number: QTBUG-40757 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update the src/3rdparty submoduleJocelyn Turcotte2014-08-261-0/+0
| | | | | | | This includes the XCode 5.0 build fix. Change-Id: I99a5a9b64cc4b31f41cc94eea380a1d61d7f7218 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Use a relative submodule url for src/3rdpartyJocelyn Turcotte2014-08-261-1/+1
| | | | | | | | | | | Now that the CI configuration has been updated to support them, use a relative submodule URL to make sure that we use the same mirror for our submodule that was used for qtwebengine. Change-Id: I92215bd3caef2bb33820185572f5bb088718f61f Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Tweak the back and forward buttonsPierre Rossi2014-08-224-17/+79
| | | | | | | | | To have a more "discoverable" UX, and cleaner UI (requiring private QML API for now). Change-Id: Ic275287d429149a1c353a1cbdc5b7f9b19e57410 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Disable the Windows build on 64bit or non-angle configured QtJocelyn Turcotte2014-08-221-0/+4
| | | | | | | | Those configurations should be re-enabled once we support them properly. Change-Id: Id8019df8e0b34a2fb1a411780689f28def50546f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Update the version numbers for the WebEngine QML types.Zeno Albisser2014-08-211-4/+4
| | | | | | | | For the WebEngineVersionBumper we have to remove the major version bits after right shifting to determine the minor number. Change-Id: I09f47dd261dc8de1e5cc94085ac3fdf3503588fb Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Revert "Improve roles"Jocelyn Turcotte2014-08-211-70/+33
| | | | | | | | | | | This reverts commit 7ea45766f6c49de9a81a387013fb1b98ab82766d. This blocks our integration into qt5.git for now as we would need to update qtbase as well and prevent us from pushing build fixes beyond this change. Let's get it in again after the alpha. Change-Id: Ie57c99dd91fc19ae2695f8d881a0a8318e988806 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* [OSX] Buildfix: Classes used with templates must be fully qualified.Zeno Albisser2014-08-212-7/+5
| | | | | Change-Id: Idf1cd3990e2cfd9e2ed3b017370e689c1126bb48 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update License Headers for Qt WebEngine to LGPLv3.Zeno Albisser2014-08-21132-1952/+1566
| | | | | | | Change-Id: Idbe0eafb51d77cc00e3a93179b81770724d5bfaa Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Update the submodule to try and make it through the CIPierre Rossi2014-08-201-0/+0
| | | | | Change-Id: I32e7a89f5d86be18d8e10606af480fd082c214a8 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 02:31:53 +0000