summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5' into 5.6Allan Sandfeld Jensen2015-09-242-3/+9
|\ | | | | | | Change-Id: Ice3d6e88238940a62d75e7c67f63b626285fccb0
| * enable OS X 32 bit buildJoerg Bornemann2015-09-211-1/+1
| | | | | | | | | | | | Task-number: QTBUG-48228 Change-Id: Ic8ee640316b95b2e7e2de9115330821dfae0e905 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * do not generate qmake_extras.gypi in the source directoryJoerg Bornemann2015-09-091-2/+8
| | | | | | | | | | | | | | | | | | | | Among other things, we store the used compiler in there. This information belongs into the build directory. Otherwise switching toolchains becomes challenging. Task-number: QTBUG-43014 Change-Id: I9bec26a235f5251322792632d4667cc71210286d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Add more required pkg-config packagesAllan Sandfeld Jensen2015-09-231-0/+3
| | | | | | | | | | | | | | These packages are required if Qt was build against them. Change-Id: I2b664229485dd764617d1683647951ab600768ed Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update dependenciesAllan Sandfeld Jensen2015-09-182-9/+13
| | | | | | | | | | | | | | | | Add more pkg-config based libraries that we need to build Qt WebEngine and update Chromium SHA so that we do not need ATK. Change-Id: I713823e3dcad9b9f5a112d500d23281ac59c307b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Unite commmon linux platform configurationAllan Sandfeld Jensen2015-09-101-5/+0
| | | | | | | | | | | | | | Move duplicated linux configuration to linux.pri Change-Id: I9f6f876e09fb748fb78cfbd5201a4326693f0be9 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Enable building linux-clang platformAllan Sandfeld Jensen2015-09-071-1/+1
| | | | | | | | | | | | | | | | Adds the necessary flags to build with clang on desktop linux. Change-Id: I77f8937849bceefbae17158421a180e4a1adc2d3 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Test only for KHR headerv5.6.0-alpha1Samuli Piippo2015-09-011-3/+1
| | | | | | | | | | | | | | | | | | Raspberry Pi toolchain from yocto uses older khr headers that do not include defines for KHRONOS_FALSE and KHRONOS_TRUE, but can still be used to build qtwebengine correctly. Change-Id: Ia7a6420ba142141ebb16d880f989eb56f892f1a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update to Chromium 45.0.2454.79Allan Sandfeld Jensen2015-08-262-3/+2
| | | | | | | | | | Change-Id: Id986be0af632884ae4e7d0fb2023e71c449a9eae Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Rebasing on Chromium 45Allan Sandfeld Jensen2015-08-252-5/+10
| | | | | | | | | | | | | | Fixing the minor differences needed to work with Chromium 45. Change-Id: I5036b4b9a069d45e8dd37e24fab84cdfe5e67acc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix the build on embedded linuxAndras Becsi2015-08-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | This patch: - adds required options to the embedded_linux.pri config - adds missing events_ozone.gyp:events_ozone_evdev dependency - fixes pkg-config not to pick host paths when cross compiling - implements missing functions of the OzonePlatform interface - updates the submodule to include fixes for chromium Change-Id: I77b384738fa7d41938a68c10a007728b10d7db28 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Select Visual Studio version based on mkspecKai Koehne2015-08-031-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 7a1e0d57d1a1683442 determined the Visual Studio version based on the 'VisualStudioVersion' environment variable. While this variable is defined by the default Visual Studio command line prompt, it isn't necessarily set in other environments. Anyhow, Qt already determined the compiler/Visual Studio version in the mkspec. We can just reuse this here. Change-Id: Ibee9526e91ae855151940da6be438705de048c0c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update chromium to 44.0.2403.91Allan Sandfeld Jensen2015-07-302-8/+6
| | | | | | | | | | | | | | Also updates snapshot script for removed, added and renamed modules. Change-Id: Ie511cbddc2f7c03d9f73f7ae190701539bc91d4d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add configurable option for using system FFMPEGAllan Sandfeld Jensen2015-07-281-0/+15
| | | | | | | | | | | | | | | | | | | | | | Add qmake command line option to use system FFMPEG and report result and option in the configure summary. Also checks libraries FFMPEG and chromium both uses are available on the system since linking will otherwise fail. Does not check if the version of the libav libraries are correct, but leaves that to whomever enables the option. Change-Id: I39c9c47eba19a6e40872a2e9b24a9010cdea1011 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Use system snappy if availableAllan Sandfeld Jensen2015-07-283-0/+49
| | | | | | | | | | | | | | Snappy doesn't use pkg-config so we use a configure check to detect it. Change-Id: I54f02d493139069ca8838f7008041340990fc016 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add post configure step and make using system ICU an optionAllan Sandfeld Jensen2015-07-273-1/+28
| | | | | | | | | | | | | | | | | | | | Adds a post configure step to test qmake arguments, summerize options, and make it possible to enable using system ICU, but leaving it default off for now. Also summerizes the proprietary codec configuration. Change-Id: I620a69dcdbb14b49143770d38eecb5aeab48ad05 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Use system libsrtp if availableAllan Sandfeld Jensen2015-07-193-0/+48
| | | | | | | | | | | | | | | | Adds configure check and configures chromium to use system libsrtp if available. Change-Id: I134c50e1179bfb6acf01347456f8be26f27bf559 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Detect and use system librariesAllan Sandfeld Jensen2015-07-191-5/+16
| | | | | | | | | | | | | | | | Uses pkg-config to detect libevent, libwebp, flac, jsoncpp, opus, speex and vpx, and configure chromium to link with system versions. Change-Id: Ic6c5bbe07929a7c2b79abcb760a8c61b0c9ed92f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Update Chromium version to 44.0.2403.80Allan Sandfeld Jensen2015-07-151-2/+2
| | | | | | | | | | | | | | | | Also switch to parsing DEPS instead of .DEPS.git as the latter has been removed from upstream chromium. Change-Id: Ie449e310202458c5c514a5eb6af2d30486ec0891 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Add xscrnsaver to required packagesAllan Sandfeld Jensen2015-07-021-1/+1
| | | | | | | | | | | | | | | | | | Xscrnsaver is now used for idle desktop detection on Linux, and required unless we disable that functionality from Chromium. Change-Id: I5295ebd822a4b53024d86868aa6dc4912ab120c1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | Unbundle zlib, minizip, libxml2 and libxslt on LinuxAllan Sandfeld Jensen2015-07-011-0/+8
| | | | | | | | | | | | | | If available use the system versions of these basic libraries on Linux. Change-Id: Iebcd5c11c53d0d491c457ccff71be04f8b2cac1c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Fix MSVC buildsAllan Sandfeld Jensen2015-06-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Chromium now expects the MSVS version to be set in GYP_MSVS_VERSION, so we need to set that. Fortunately we can use the VisualStudioVersion environment to do so. Note we should be setting it to "2013e" when using Express, but I can not currently detect that. Change-Id: Id51c04c8d3292c05809d4aa1301a50b12b2d57fd Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Disable V8 binary blobsAllan Sandfeld Jensen2015-06-231-0/+2
| | | | | | | | | | | | | | | | | | V8 will now by default require two external binary blobs in libexec. We prefer not having to ship more external dependencies, which are both inconvinient and a security risk. Change-Id: Id171f9be83add871bfa7d76c000799ebda9b7666 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Update scripts for Chromium 44Allan Sandfeld Jensen2015-06-232-24/+22
|/ | | | | | | Updates version and snapshot script Change-Id: Ie1bd69d6a5042edbd563357bb2fc326cbbb813e8 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Partially revert "Fix QtCreator loading of qtwebengine.pro"Andras Becsi2015-04-243-4/+4
| | | | | | | | Changing the python print signature seems to cause problems on Windows, so revert it. Change-Id: I715f792b880a2269ec153bbc73b432c6a4e87cc5 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix QtCreator loading of qtwebengine.proAndras Becsi2015-04-153-4/+4
| | | | | | | | | | | | | When QtCreator loads qtwebengine.pro some parsing errors are shown if it picks up the system python3 for basic detection. Although we do not plan to support python3 with all of our scripts (since Chromium does not) these simple cases can be fixed by using the function version of python's print. This patch also adds the Chromium source path to the core INCLUDEPATH so that Chromium headers are indexed as well. Change-Id: Ia6dec1c776fdcddf875fb8e814d8fb33b7340989 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Remove eAndroid hooksAndras Becsi2015-04-144-5/+3
| | | | | | | | Support for the B2Qt/eAndroid platform is discontinued with Qt 5.5 so we can remove all remnants of the android platform. Change-Id: I93f15fcd4a345203e15010ddf1e8de3e8d28ab56 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Enable building the QML test support API for developer buildsAndras Becsi2015-03-121-0/+1
| | | | | | | | This makes sure developers at least build this codepath so we have the needed coverage to find out if something breaks. Change-Id: Id56ecf5bb051e873e9bcf313a50a5eec23c2bd83 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Add testsupport QML API and error page signalsPeter Varga2015-03-061-0/+6
| | | | | | | | | | | The testsupport API is used for test those features that are not planned to be accessible via the public API. For example, signals of the chromium's error page should not be visible for the develepor but it is important to test whether the error page is loaded properly. Change-Id: Ie5b3265a207d05649cabd624a001a6ffe2e45971 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>
* 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 copyright headersJani Heikkinen2015-02-1612-106/+106
|/ | | | | | | | | 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>
* 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>
* Check for python version 2, minor version 7 and up when building.Michael Brüning2015-01-201-2/+2
| | | | | | | | | Python 3 is not supported by the Chromium build system and installation of the Qt WebEngine libraries will fail. Change-Id: Ie402c069afecf087de8521401ed4261e74df8b87 Task-number: QTBUG-43242 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Update Chromium to version 40.0.2214.28 and ninja to 1.5.3.Zeno Albisser2015-01-205-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * scoped_refptr operator for implicit conversion to pointer has been disabled upstream: https://codereview.chromium.org/510323002 * Group permission API as done upstream: https://codereview.chromium.org/622793002 * content_worker gyp target has been removed upstream. * GetPageThumbnailData moved to DevToolsManagerDelegate. * ui/ui_resources has been renamed to ui/resources * WebPreferences and ResourceType have moved inside content. * Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(): https://codereview.chromium.org/457103003 * Remove obsolete accessibility events. * AX_EVENT_SELECTED_TEXT_CHANGED has been renamed to AX_EVENT_TEXT_SELECTION_CHANGED * AX_ROLE_MATH_ELEMENT was removed upstream. https://codereview.chromium.org/695133002 * Screen::IsDIPEnabled has been removed upstream. https://codereview.chromium.org/672823002 * Update DevToolsHttpHandlerDelegateQt according to ShellDevToolsManagerDelegate. * Various functionality from DevToolsHttpHandler was moved to DevToolsManagerDelegate https://codereview.chromium.org/560323005 * DevToolsHttpHandler::Start expects a scoped_ptr now. * Make sure event_factory_evdev.h is not included when USE_OZONE is not defined * ErrorPageParams was moved into namespace error_page. * Media Access is now handled by ContentBrowserClient::CheckMediaAccessPermission * SpecialStoragePolicy moved to namespace storage * Add implementation for new pure virtual function BrowserContext::GetSSLHostStateDelegate. * RenderPass::Id was renamed to RenderPass::RenderPassId * Include view_messages.h for ViewHostMsg_TextInputState_Param * CERT_UNABLE_TO_CHECK_REVOCATION has been deprecated by Chromium: https://codereview.chromium.org/449743002 * MailboxManager::ConsumeTexture only takes the mailbox as an argument * Replace RWHVQt::TextInputStateChanged with RWHVQt::TextInputTypeChanged. * RenderWidgetHostView::ScrollOffsetChanged has been removed. * SkBitmap::Config was removed upstream. * CopyFromCompositingSurfaceCallback has become an own type. * AcceleratedSurfaceInitialized only takes route_id as an argument. * ServerBoundCertService has been renamed to ChannelIDService. Related API has been renamed accordingly. * TextureImageTransportSurface was removed upstream. * Update MediaCaptureDispatcher::OnMediaRequestStateChanged signature. * AudioStream related functions are gone upstream. https://codereview.chromium.org/569713002 * Add implementation for RenderWidgetHostViewQt::GetLastScrollOffset. * Include generic touch_device implementation. * switches::kDisableDesktopNotifications was removed upstream. https://codereview.chromium.org/607843002 * PageTransition moved to ui. * Messages headers are not guarded. Including them multiple times does hurt. * ScaleGestureDetector does not create a standalone GestureDetector anymore. https://codereview.chromium.org/501503003 * MotionEvent::Cancel and Clone are not virtual anymore. https://codereview.chromium.org/502993004 * Exclude os_exchange_data_provider_mac from build. * Remove argument from ScopedClipboardWriter ctor. https://codereview.chromium.org/558913003 * Remove ShowPopupMenu override from WebContentsQt. The function is not pure virtual anymore, and we never implemented any specifics. * Do not use clang on desktop linux. * Request functions in ContentBrowserClient were merged into RequestPermission. * ninja: use configure.py --bootstrap instead of bootstrap.py Change-Id: I3575612826db7845461a949b4e737264bb4e8d88 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Make GCC 4.7 mandatory to build Qt WebEngine.Michael Brüning2015-01-191-3/+3
| | | | | | | GCC 4.6 does not support all the C++11 features that we need. Change-Id: I41974b16c361ea1bb1934758bf2eb3b73d2df653 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Add c++11 as a requirement.Pierre Rossi2015-01-161-0/+4
| | | | | | | | | Skip the build otherwise. This is so we can land the new snapshot, which by now generalized the use of some c++11 features (See https://chromium-cpp.appspot.com/ for details). Change-Id: If17b88030f8fd28f48e1f52f03c28b015975ad82 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devPierre Rossi2015-01-168-9/+111
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Ied43de29444d4803218e250b096b9c72bc017af7
| * Add additional dependency checksPierre Rossi2015-01-161-1/+9
| | | | | | | | | | | | | | | | | | For dependencies that have caused trouble before, such as libdrm. Task-number: QTBUG-41516 Change-Id: I0cee98282e93460971471796a65a43be4750c6b0 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Refactor our build skipping logicPierre Rossi2015-01-166-6/+99
| | | | | | | | | | | | | | | | | | | | Move the logic to mkspecs to keep the .pro files robust. Add the basic infrastructure for config.tests, the first one of which will consistently ensure we have libcap on linux. Change-Id: Iee4207e747e589ba67d5353cb4c18f156e555c11 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Print only major.minor.micro version of python.Zeno Albisser2015-01-151-1/+1
| | | | | | | | | | | | | | | | This will avoid printing the compiler version python was built with. Showing the compiler version led to confusion multiple times. Change-Id: I4ced2128b92c83a41f616bcf756f2c313a9caed3 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Remove possible quoting charactersStephan Binner2015-01-071-2/+3
| | | | | | | | | | | | | | | | qmake may have quoted already because of certain characters like ~ in build path Change-Id: I8a085d23da3da8876f3acd807c9468fc43c7dacb Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Do not allow taking snapshots with setting ignorecase=true.Zeno Albisser2014-12-031-0/+6
| | | | | | | | | | Change-Id: Ia0cec7f1498c3459ec1d1ce6ab807994c04564e2 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | take_snapshot.py: Do not adopt .gitattributes files.Zeno Albisser2014-12-031-0/+1
| | | | | | | | | | | | | | | | | | Some of these files enforce crlf conversion. For packaging reasons we have to make sure we never have crlf in our repository. Change-Id: I3b4da212c587f8461819f3d01e4967ebefaef4b0 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | take_snapshot.py should only clear directories.Zeno Albisser2014-12-031-1/+1
| | | | | | | | | | | | | | | | Specifically we want to keep the file src/3rdparty/.gitattributes. Change-Id: I76f3fe6d6f8b8477834e31a4806f23928a0ca010 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Whitelist/Blacklist several files for the snapshot based on Chromium ↵Zeno Albisser2014-12-031-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40.0.2214.5. Include files related to: - components_strings - chrome_version.rc.version - error_page - *.grdp files within components Exclude files related to: - junit - polymer - google_input_tools - cython Change-Id: I2388ec7694890d573cbea843de23471c6a5395a6 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | do proper escaping before replacingStephan Binner2014-12-021-3/+5
|/ | | | | Change-Id: I9d11038779494a3bb14107369b54c06baead96a9 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Print a more descriptive warning when a build is skipped.Michael Brüning2014-10-291-1/+8
| | | | | | | | | This should help users understand which prerequisites are missing from their system and may also help find invalid CI configuration quicker. Change-Id: If564825c11782b6e760f016893010008d9a551fa Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fixing quotation mark usage for WindowsAdam Kallai2014-10-291-2/+2
| | | | | | | | | The Windows command shell try to interpret the single quotation mark as a command. Change-Id: I4dc4382bdbe0c90565f6ac56c33a80971669344c Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Michael Bruning <michael.bruning@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 10:49:03 +0000