summaryrefslogtreecommitdiffstats
path: root/src/buildtools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-05-191-2/+15
|\ | | | | | | | | | | | | Conflicts: src/core/render_widget_host_view_qt.cpp Change-Id: I86113b13bb2d8419e9e9a485197f02b2c7399cd4
| * Add support for Keyboard.getLayoutMap()Peter Varga2021-05-121-2/+15
| | | | | | | | | | | | | | | | | | | | | | Pulls in the following changes: Submodule src/3rdparty 6c7b4ffb..1d3b13e9 > 1d3b13e9634 Make clang to inline load/store atomic calls for YieldSortKey struct > f6730fe81a0 Enable XkbKeyboardLayoutEngine::SetCurrentLayoutByName for Qt Fixes: QTBUG-92971 Change-Id: I0c0cddfe4d3e25fd6d3f7e0764b302c300303172 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Adaptations for Chromium 88Allan Sandfeld Jensen2021-04-151-2/+1
| | | | | | | | | | Change-Id: Ie66e95dbb9fbcafe961bb98d5c277f8c32d66b96 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-03-162-2/+0
|\| | | | | | | Change-Id: I0dd7c64669f4b130047a4a3836f62f7ee5b5f8d9
| * Remove QtPdf dependency on nss at build-timeAllan Sandfeld Jensen2021-02-172-2/+0
| | | | | | | | | | Change-Id: I653dee03adcad422d1210fda48bdd5b701382b00 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-02-172-0/+3
|\| | | | | | | Change-Id: Idee0142b0e33fdf8ca663f1ef1bcd8b932985043
| * QtPdf apparently depends on libnss on linuxAllan Sandfeld Jensen2021-02-092-0/+2
| | | | | | | | | | | | | | At least that pkg-config can resolve it. Change-Id: Id0e0a37ad4aa85f11dfdd74bc174d17d36ed4ce2 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Add nodejs error messageAllan Sandfeld Jensen2021-02-081-0/+1
| | | | | | | | | | | | | | We require node.js now. Change-Id: I9f0bbd7c374102e2a5d4a256237b89977d073980 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-01-255-42/+54
|\| | | | | | | | | | | Including update to 87-based Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6
| * Enable hangout services extensionPeter Varga2021-01-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | [ChangeLog] Enable hangout services extension and implement its WebRTC desktop capture extension API dependency. Fixes: QTBUG-85731 Task-number: QTBUG-51185 Task-number: QTBUG-61676 Change-Id: I7a659c2b0039243ac8d8c58685716ffc55265e3b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Remove Java build dependencyAllan Sandfeld Jensen2021-01-151-2/+3
| | | | | | | | | | | | | | | | We were actually using closure compilation, let's disable it for now, until we have java build-time detection. Change-Id: Ie5fd0f397a773d38a1eb8a94ac2f186e9073ea6e Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Remove configure options that doesn't workAllan Sandfeld Jensen2021-01-151-29/+0
| | | | | | | | | | | | | | They are just confusing users. Change-Id: I107b4212e425e77b892c1ce77ee0fbfb89a97c7f Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Adaptations for Chromium 87Allan Sandfeld Jensen2021-01-134-10/+49
| | | | | | | | | | Change-Id: Ic4ffd98e02f986dbaf986405360e727c813e696e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Adaptations for Chromium 85Allan Sandfeld Jensen2021-01-131-0/+1
| | | | | | | | | | Change-Id: I33c1af7c431055d95e0fb540246765cce684de15 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Adaptations for Chromium 84Allan Sandfeld Jensen2021-01-131-1/+0
| | | | | | | | | | Change-Id: I359805d0bea84147fca6de2e2c7b17b4dcb17bc7 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-12-111-2/+38
|\| | | | | | | Change-Id: Id1a1f4ca84697ba18e2604090e3154295fe1858b
| * Update minimum HarfBuzz version to 2.4.0Peter Varga2020-12-081-2/+2
| | | | | | | | | | | | | | | | | | Chromium uses HarfBuzz only for font subsetting since the 83-based update and it can't be built with older HarfBuzz version than 2.4.0. Task-number: QTBUG-88976 Change-Id: Ibcea31b487c3f8d1b3f9b8566b95ddf2a35987bb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add QtZlib as static dependencyMichal Klocek2020-12-081-1/+7
| | | | | | | | | | | | | | | | | | | | | | QtZlib is a semi private module, headers are installed as Qt5Zlib, however all object are in QtCore. Add support to compile against Qt5Zlib when doing static build. Task-number: QTBUG-87154 Change-Id: I74d1b217725b37781808a54902f9acbee41c50c4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add qt static deps when doing static buildMichal Klocek2020-12-081-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add qtfreetype, qthurfbuzz, qtlibpng, qtlibpng static 3rdparty libs. If qtbase has some 3rdaprty libs, which are also present in chromium. This leads to duplicated symbols and can lead to unexpected issues with application. Currently we do only static builds for qtpdf, therefore this changes only affects qtpdf builds. If qtfreetype is used, hurfbuzz dependency is not used, qtlibpng is only used when pdf compiled with xfa. Task-number: QTBUG-87154 Change-Id: Ibba528268d9c989a2c63c1a7881ba0c95c325437 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devJüri Valdmann2020-10-021-1/+1
|\| | | | | | | Change-Id: Id3613b8dcda5629bce9e3cd14fa926567125a960
| * Fix typo for static linking with no rsp filesMichal Klocek2020-09-241-1/+1
| | | | | | | | | | | | | | | | Fix typo which surprisingly gives no errors with archiver, however generated archives are bogus (at lest with lld) Change-Id: Iea1e22c66eb99a720b398c5903b56938b309905f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-09-144-15/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/certificate_error_controller.cpp src/core/certificate_error_controller.h src/core/compositor/compositor.cpp src/core/compositor/compositor.h src/core/compositor/display_gl_output_surface.cpp src/core/content_browser_client_qt.cpp src/core/core_chromium.pri src/core/delegated_frame_host_client_qt.cpp src/core/ozone/gl_share_context_qt.h src/core/ozone/surface_factory_qt.cpp src/core/permission_manager_qt.cpp src/core/render_widget_host_view_qt.cpp src/core/render_widget_host_view_qt.h src/core/web_engine_context.cpp src/core/web_engine_settings.cpp src/core/web_event_factory.cpp tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp Change-Id: Ice14c3c350b139e800c7c7011b7cef1fc7010669
| * Adaptations for Chromium 83Allan Sandfeld Jensen2020-09-093-6/+5
| | | | | | | | | | Change-Id: I63ed851426b18623d549ceaf87f1b6eeec527966 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| * Chromium 81-based adaptationsAllan Sandfeld Jensen2020-09-091-6/+15
| | | | | | | | | | Change-Id: Ie422b327025da084bc8038c7a0aadee2db801f29 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| * Do not use rsp file when static linkingMichal Klocek2020-08-311-3/+6
| | | | | | | | | | | | | | | | | | This supposed to be covered by ff50fbf but got lost in following patchsets and static ios build did not complain about it. Change-Id: Ie4e34dc12d942442824ba1f0e3483bed682b3157 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-09-071-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/core/compositor/display_gl_output_surface_qsg.cpp src/core/web_engine_context.cpp tests/auto/quick/quick.pro Change-Id: Iaf03434696788c89f5d3b524969513a89cb0a235
| * Do not turn web auth offAllan Sandfeld Jensen2020-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Submodule src/3rdparty 0a4240a9..4a996760: > Fix building FIDO with gcc5 > [Backport] CVE-2020-6512: Type Confusion in V8 (3/3) Fixes: QTBUG-85117 Task-number: QTBUG-54720 Change-Id: I074831454b469c17a71f2ca75a075ee48157970d Reviewed-by: Tamas Zakor <ztamas@inf.u-szeged.hu> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devMichael Brüning2020-07-281-2/+1
|\| | | | | | | Change-Id: Ie9970a657f7693c190405039c9b713e24dbd4041
| * Do not evaluate NINJA_TARGETDEPSMichal Klocek2020-07-271-2/+1
| | | | | | | | | | | | | | It is just a file path. Fixes qmake linking when chromium changes. Change-Id: Ib2f0976a6dc3c90c415b69e1876706bc2397d134 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Merge remote-tracking branch 'origin/5.15' into devMichael Brüning2020-07-244-12/+95
|\| | | | | | | | | | | | | | | | | Conflicts: src/core/compositor/delegated_frame_node.cpp src/core/core_chromium.pri src/core/render_widget_host_view_qt.cpp Change-Id: I9387151e9647c87fc387095e7b6d8d66560cdf71
| * Cleanup linking param order and prl generationMichal Klocek2020-07-231-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing builds we use rsp files also for archives. For static builds this would require to install rsp file. Since static builds are possible only for qtpdf with small amount of archives simply do not use rsp files for archives. Cleanup linker parameters so prl files do not point object rsp files (do not use LIBS_PRIVATE in that case). Task-number: QTBUG-85616 Change-Id: I165610e418f162c16fcfa7056af3344b80f60c05 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Share linking config between webenginecore and pdfMichal Klocek2020-07-231-0/+53
| | | | | | | | | | Change-Id: Ib06a0a1ec3372d483008cc0ac0ec211ec8316e0e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move webengine-noexecstack to buildtoolsMichal Klocek2020-07-231-0/+10
| | | | | | | | | | Change-Id: I854034fd63c8847867fd7ec01d5c25781e7de5ef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix platform support for qtpdf on iosMichal Klocek2020-07-212-12/+9
| | | | | | | | | | | | | | | | Add missing check for ios. Change-Id: I7fce6addb154ea83b8308094d5a6c4275d050d9b Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix building with xcode 10Allan Sandfeld Jensen2020-07-071-0/+1
| | | | | | | | | | | | | | Doesn't support -ftrivial-auto-var-init=pattern Change-Id: Id998b775cd51f13395c69fafd46c6ec5e997ef5b Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-06-298-287/+226
|\| | | | | | | | | | | | | Conflicts: src/src.pro Change-Id: I03c260ba676296f93d8137e79b46f3978f5f41ef
| * Do not build on qnxMichal Klocek2020-06-122-5/+13
| | | | | | | | | | | | | | It seems that coin on qt5 merge tries to build qtpdf on qnx Change-Id: Ife42dbf0484b1f0151e9c487467898c5c2567c4a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Split errorChecks for webengine and pdfMichal Klocek2020-06-032-69/+170
| | | | | | | | | | | | | | Separate error checks, so qtpdf can have own dependencies. Change-Id: I9e538b875fe67448497f10dcd45c83782d98da2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Minor. Update error checks in windows.priMichal Klocek2020-05-291-2/+2
| | | | | | | | | | | | | | These are also used by QtPdf. Change-Id: Ia8527c9c6bd6fe682cd79d3e980838388d0dcdc9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add static linking for qpdf for all platformsMichal Klocek2020-05-291-1/+0
| | | | | | | | | | Change-Id: Ie222d56c52f5ca474809b2bc864618e5b3e9a1f2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move sanitizer to buildtoolsMichal Klocek2020-05-281-0/+16
| | | | | | | | | | Change-Id: I1531199bb15b9d05e5c017d14fce07d39625cafe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move arm-thumb feature to buildtoolsMichal Klocek2020-05-282-5/+10
| | | | | | | | | | | | | | | | | | Share arm-thumb setting between pdf and webengine. Move webengine-embedded to webengine since it is not used by pdf. Change-Id: Id23888423af7a37a3b3aa06e40dc0359fb90724b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Remove duplicated feature webengine-ozone-x11Michal Klocek2020-05-281-1/+0
| | | | | | | | | | | | | | This feature is already in buildtools. Change-Id: Iff5d5cc4b72b29b850e8e4cb11b90251916ed9c7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Move pdfium zlib and png configs to buildtoolsMichal Klocek2020-05-281-0/+9
| | | | | | | | | | | | | | | | Adjust config so we use pdfium in webengine not only with printing. Change-Id: I1c4b263e89a993bde84b92872a5ad1d6d48cedbb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Split gn args for pdf and webengineMichal Klocek2020-05-286-206/+0
| | | | | | | | | | | | | | | | | | Currently we run gn with same sets of arguments for pdf and webengine. Split those so we can make fine grain configuration and drop some requirements. Change-Id: I40890b5475dddadd0798ea091ca5e7143fd952b3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add missing checks to configureMichal Klocek2020-05-282-8/+16
| | | | | | | | | | | | | | | | | | | | During tossing wip-qtpdf across 5.14 and 5.15 some checks got skipped. Fix configuration. We share error messages between configure and make steps. Change-Id: I15e4a66adc62f06c403487c8a4eb8925ce260447 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-05-152-25/+2
|\| | | | | | | | | | | | | Conflicts: src/pdf/quick/qquickpdfselection_p.h Change-Id: I6eec37a01347c2d47cbfc1114326dfc6b58719ff
| * Remove xkbcommon hackAllan Sandfeld Jensen2020-05-132-19/+2
| | | | | | | | | | | | | | | | | | We fixed Chromium to compile with the right include paths, and the system package is already required by QtGui. Fixes: QTBUG-83693 Change-Id: I8256e67cf0fca3aa71df6d6bad1b13436c689b8a Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Fixup xkbcommon testAllan Sandfeld Jensen2020-04-231-9/+3
| | | | | | | | | | | | | | | | It needs to be includable without using special include path. Task-number: QTBUG-83693 Change-Id: Ibdee6ff00fde66a9de970bbaba9282c42e420c6b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-04-275-62/+45
|\| | | | | | | | | | | | | | | Conflicts: configure.pri src/pdf/api/qpdfpagerenderer.h Change-Id: I7e68277080e29238bbfe8511539ea75b2db89489
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 08:27:15 +0000