aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase_git.bb
Commit message (Collapse)AuthorAgeFilesLines
* qt5: update submodulesMikko Gronoff2021-11-221-1/+1
| | | | | | | | Update to latest content in Qt 5.12.12 branch. Task-number: QTBUG-97547 Change-Id: I444040366faf7b247af8ceac3ffedd5ae600f2c7 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* b2qt: Update submodules pre-5.12.12Dan Ackers2021-11-161-1/+1
| | | | | Change-Id: I76fdfe835576e0d1a4c901ef35dc821e2753f557 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* Update submodules to test snapshot state pre 5.12.12Dan Ackers2021-10-201-1/+1
| | | | | | Task-number: QTBUG-97548 Change-Id: I2a6f96d49abe739f07a3986942526191fc25f64e Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* Merge remote-tracking branch 'warrior' into 5.12Dan Ackers2021-10-181-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Topics of changes that are brought in: *qtwebkit: Add patch to fix build with bison 3.7 *qtwebkit: Fix build with icu-65.1 *qtwebkit: fix build with icu >= 68 *qtwebengine: fix build with glibc-2.34 *qtwebengine: Fix build with ninja >= 1.10.0 -For now just skip version check *qtdeclarative: Ask for python3 explicitly *nativesdk-qtbase: inherit pkgconfig -some features enabled with PACKAGECONFIG need pkgconfig to be detected correctly *qtwebkit: Inherit pkgconfig *qtgamepad: inherit pkgconfig *qtwayland: Inherit pkgconfig *qtwebengine: inherit pkgconfig *qtmultimedia: inherit pkgconfig *maliit-framework-qt5: inherit pkgconfig *qtbase: inherit pkgconfig *qt5-native.inc, nativesdk-qt5.inc, nativesdk-packagegroup-qt5-toolchain-host: reorder inherits to fix new QA check *cinematicexperience: don't use trailing slash in S *qtbase-native: disable vulkan support *qtbase: Add vulkan to PACKAGECONFIGs Conflicts: recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch recipes-qt/qt5/qtbase_git.bb Change-Id: Id4bce68abb2c2f813f16363fdec1e1d3d74bf58e Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qt5: update submodulesv5.12.11Dan Ackers2021-05-191-1/+1
| | | | | | | Update to latest content in Qt 5.12.11 branch. Change-Id: Ie21df22aa999d3425407db0ba6e05c32711f4bb1 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* 5.12.11 snapshot updateDan Ackers2021-05-061-1/+1
| | | | | | Task-number: QTBUG-93348 Change-Id: I772b69394a962560b65f6c45450b2cab607e7651 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qt5: update submodulesv5.12.10Lassi Lehikoinen2020-11-031-1/+1
| | | | | | | | Update to latest content in Qt 5.12.10 branch. Task-number: QTBUG-86653 Change-Id: I7945c25ce7338e8606eed15ceefb351a909bfa20 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qt5: update submodulesLassi Lehikoinen2020-10-291-1/+1
| | | | | | | | Update to latest content in Qt 5.12.10 branch. Task-number: QTBUG-86653 Change-Id: Id6f1e4b6e012697fcc9e8348b29a94f20898d19e Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qt5: update submodulesLassi Lehikoinen2020-10-231-1/+1
| | | | | | | | Update to latest content in Qt 5.12.10 branch. Task-number: QTBUG-86653 Change-Id: I85fbe4ad761ba6d2491437bb66032ae2803502ad Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: update submodulesv5.12.9Mikko Gronoff2020-06-111-1/+1
| | | | | | | | Update to latest content in Qt 5.12.9 branch. Task-number: QTBUG-84136 Change-Id: Ib82e3b1af4f16596467a9bfd817232a833a2a761 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* qt5: update submodulesMikko Gronoff2020-05-281-1/+1
| | | | | | | | Update to latest content in Qt 5.12 branch. Task-number: QTBUG-84136 Change-Id: I0fdb2db0678108836ba723d61502532782b88f5a Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: update submodulesMikko Gronoff2020-05-151-1/+1
| | | | | | | | Update to latest content in Qt 5.12 branch. Task-number: QTBUG-84136 Change-Id: If7dd055ea0da8e0d649a00b440c74bef4a50222c Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: update submodulesv5.12.8Mikko Gronoff2020-04-011-1/+1
| | | | | | | | Update to latest content in Qt 5.12.8 branch. Task-number: QTBUG-82321 Change-Id: I0f8b38b16745b56c2475190ca0114cce738c8dc9 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: update submodulesMikko Gronoff2020-03-171-1/+1
| | | | | | | | Update to latest content in Qt 5.12 branch. Task-number: QTBUG-82321 Change-Id: I727853b81c58cbc748fea5dc9b9a80b32658ba72 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: update submodulesMikko Gronoff2020-03-041-1/+1
| | | | | | | | Update to latest content in Qt 5.12 branch. Task-number: QTBUG-82321 Change-Id: I10b41554c15e9c7f497e1334cdb81fb73295c8bd Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: update submodulesv5.12.7Mikko Gronoff2020-01-281-2/+2
| | | | | | | | | - Update to latest content in Qt 5.12.7 branch - Update license agreement to v4.2.1 Task-number: QTBUG-80874 Change-Id: Ia2c3ec11e4c085bbd74e0a795883f48d0a6f5052 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: update submodulesMikko Gronoff2020-01-201-1/+1
| | | | | | | | Update to latest content in Qt 5.12.7 branch. Task-number: QTBUG-80874 Change-Id: Ia94456be66620ac129016de143848c8f1026f86b Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12Mikko Gronoff2019-11-201-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | * qtyocto/upstream/warrior: 1718712 qtconnectivity,qtsystems: Account for bluez4 from oe-core 4075be1 libqofono: bump SRCREV and add a fix for voicecall a119e2e qtbase: refresh patches from github forks 6ee18b2 layer: Mark zeus as compatible release c379ee9 qt5: update to Qt 5.12.5 1b2862e qt3d-runtime: update to ogl-runtime v2.4 a05a041 qtvirtualkeyboard: update supported layouts Change-Id: I86f8956ddc05312ceb0258531c01bb1f0d66bed3
| * qtbase: refresh patches from github forksMartin Jansa2019-10-101-1/+1
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: update to Qt 5.12.5Mikko Gronoff2019-10-081-1/+1
| | | | | | | | Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
* | qt5: update submodulesv5.12.6Mikko Gronoff2019-11-111-1/+1
| | | | | | | | | | | | Task-number: QTBUG-79724 Change-Id: I7e3c0bb4ea3c6e15695c9aca29883424fe33540a Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2019-11-061-1/+1
| | | | | | | | | | | | | | | | Update to latest content in Qt 5.12.6 branch. Task-number: QTBUG-79724 Change-Id: I2108db0afb944a9e92b847d221762df796eec15c Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesv5.12.5Mikko Gronoff2019-09-051-1/+1
| | | | | | | | | | | | | | | | Update to latest content in Qt 5.12.5 branch. Task-number: QTBUG-77437 Change-Id: I180975c8f788805cc3aabb43ebad9b8f7af2b0f3 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2019-08-301-1/+1
| | | | | | | | | | | | | | | | Update to latest content in Qt 5.12.5 branch. Task-number: QTBUG-77437 Change-Id: I49eadeda805dc5aa77db2d40eb938859474b16e1 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2019-08-231-1/+1
| | | | | | | | | | | | | | | | Update to latest content in Qt 5.12.5 branch Task-number: QTBUG-77437 Change-Id: I9bb52d1887e579477fe4c9dcb3a4386423541659 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | qt5: update to Qt 5.12.5Samuli Piippo2019-08-131-1/+1
| | | | | | | | | | | | Change-Id: I7fcb677b9b9fcb28f2ba7977a4060036cc7a8c98 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* | Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12Mikko Gronoff2019-06-251-1/+2
|\| | | | | | | | | | | | | | | | | | | * qtyocto/upstream/warrior: 2a5f941 qtbase: fix build with gcc-9 8bc72a7 qtlocation: add PACKAGECONFIGs for geoservices 46c87e0 qmake5_base.bbclass: Don't expand find -name search patterns Change-Id: I99658e8311a90d752f92ac486040b24bc98cefb2
| * qtbase: fix build with gcc-9Martin Jansa2019-05-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * some components which use Werror started to fail with gcc-9, because of new warning: https://gcc.gnu.org/gcc-9/changes.html New warnings: -Wdeprecated-copy, implied by -Wextra, warns about the C++11 deprecation of implicitly declared copy constructor and assignment operator if one of them is user-provided. -Wdeprecated-copy-dtor also warns if the destructor is user-provided, as specified in C++11. * e.g. maliit-framework-qt5 was now failing with: maliit-framework-qt5/0.99.0+gitAUTOINC+62bd54bcde-r0/recipe-sysroot/usr/include/QtCore/qvariant.h:273:25: error: implicitly-declared 'constexpr QVariant::Private& QVariant::Private::operator=(const QVariant::Private&)' is deprecated [-Werror=deprecated-copy] 273 | { other.d = Private(); } | ^ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qtbase: update modulev5.12.4Mikko Gronoff2019-06-131-1/+1
| | | | | | | | | | | | | | | | Update to latest revision in Qt 5.12.4 branch. Task-number: QTBUG-75966 Change-Id: Id72264952f7036a93e8f584eb0e38e5b5f99cd52 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* | qt5: update submodulesMikko Gronoff2019-06-101-1/+1
| | | | | | | | | | | | | | | | Update to latest content in Qt 5.12.4 branch. Task-number: QTBUG-75966 Change-Id: Idff739848eea3b1fe0ac90a1ef372aa681c8c0a1 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* | qt5: update submodulesMikko Gronoff2019-05-291-1/+1
| | | | | | | | | | | | | | | | Update to latest content in Qt 5.12.4 branch Task-number: QTBUG-75966 Change-Id: I481a2f9a7e8ac3cd28c0c32b793c3fcd11124cb2 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12Mikko Gronoff2019-05-231-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qtocto/upstream/warrior: 60e61ea qt3d-runtime: update to v2.3 cad5f8c qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES 44aab3a qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT 000e298 qtbase: add libxext dependency for xcb PACKAGECONFIG ba08444 python-pyqt5: Update to version 5.12.1. 6a1a387 python-pyqt: Fix annoying problems. c7e0ba5 qtwebengine: arm: use OE specified -mcpu option 9c62c01 qtbase-tools: Fix error during pkg_postinst f4531ec qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm Conflicts: recipes-qt/qt5/qtbase_git.bb Change-Id: I853b6669bd4e42224b278587c412032903ba5555
| * qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURESMartin Jansa2019-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | * otherwise building qtbase with default config will fail with: ERROR: The OpenGL functionality tests failed! You might need to modify the include and library search paths by editing QMAKE_INCDIR_OPENGL[_ES2], QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your platform. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULTMartin Jansa2019-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | * the original goal was to keep the default PACKAGECONFIG as minimal as possible, but I think it's time to enable this * most builds probably have this enabled anyway because of other dependencies * new qtbase also shows a warning when it's disabled: WARNING: Accessibility disabled. This configuration of Qt is unsupported. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: add libxext dependency for xcb PACKAGECONFIGMartin Jansa2019-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | * with new Qt, qtbase fails to build with x11 DISTRO_FEATURES ERROR: Feature 'xcb-xlib' was enabled, but the pre-condition 'features.xlib && libs.xcb_xlib' failed. Trying source 0 (type makeSpec) of library xlib ... None of [libXext.so libXext.a] found in [] and global paths. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase-tools: Fix error during pkg_postinstKurt Kiefer2019-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | When staging the sdk, the following error is seen: sed: can't read <path-to-work>/sdk/image/usr/local/oecore-x86_64/sysroots/aarch64-oe-linux/usr/bin/qt.conf: No such file or directory because the qt.conf file moved from /usr/bin/qt.conf to /usr/bin/qt5/qt.conf This change locates the qt.conf file during pkg_postinst using the OE_QMAKE_PATH_BINS variable, just as when the file is created.
* | Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12Mikko Gronoff2019-05-031-28/+37
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qtyocto/upstream/warrior: 8586caf qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch 7dc422d qtwayland: check also that the destination for private headers exists before installing them 84d647a qtwayland: improve manual header installation 3d60f9a qtwayland: workaround upstream bug: install missing headers manually eb5d6da qtwayland: disable gold for all archs like in qtbase e2707a0 qt5: upgrade to 5.12.3 0778424 qtbase: disable gold for all archs not just x86 4303873 qtbase-native: use QT_CONFIG_FLAGS variable like qtbase and nativesdk-qtbase 8895ea3 qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28 95974f4 qtbase, qtmultimedia: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks a4bf240 qtbase-native: add native libdir to search path adf7f60 qt5: patch build paths from installed files 28d4bfd Upgrade to 5.12.2 5a32838 layer.conf: Add warrior to compatible release series Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcanvas3d_git.bb recipes-qt/qt5/qtcharts_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdatavis3d_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtgamepad_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtknx_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmqtt_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtnetworkauth_git.bb recipes-qt/qt5/qtopcua_git.bb recipes-qt/qt5/qtpurchasing_git.bb recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtscxml_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialbus_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtvirtualkeyboard_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebglplugin_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtwebview_git.bb recipes-qt/qt5/qtx11extras_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I085dfdddbf7915f776bd48a6d26ecf96777d9d19
| * qt5: upgrade to 5.12.3Martin Jansa2019-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | * be aware that in 3 qt* project the v5.12.3 tag wasn't created yet: qtknx_git.bb:# v5.12.3 tag wasn't created yet qtmqtt_git.bb:# v5.12.3 tag wasn't created yet qtopcua_git.bb:# v5.12.3 tag wasn't created yet * and qttools, qt3d, qtremoteobjects v5.12.3 tag isn't in 5.12 branch Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: disable gold for all archs not just x86Martin Jansa2019-04-181-22/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * enabling xlib in x86_64 build was failing with: ERROR: Feature 'xcb-xlib' was enabled, but the pre-condition 'features.xlib && libs.xcb_xlib' failed. * the root cause is linking with full path libm.so in my case: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.12.3+gitAUTOINC+b527725766-r0/recipe-sysroot/usr/lib/libm.so which with gold fails with: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.12.3+gitAUTOINC+b527725766-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.3.0/ld: error: cannot open /lib/libm.so.6: No such file or directory /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.12.3+gitAUTOINC+b527725766-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.3.0/ld: error: cannot open /usr/lib/libmvec_nonshared.a: No such file or directory /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.12.3+gitAUTOINC+b527725766-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/8.3.0/ld: error: cannot open /lib/libmvec.so.1: No such file or directory collect2: error: ld returned 1 exit status * not linking with libm at all in xcb test makes it pass, or linking with -lm as before works as well, but to be safe lets disable gold everywhere until it's resolved in upstream Qt * also reported in the 5.12.2 upgrade PR: https://github.com/meta-qt5/meta-qt5/pull/181#issuecomment-484425112 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28Andreas Müller2019-04-171-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently pseudo changed to not support reanameeat2 as glibc wrapper [1]. This causes massive failures at do_install [2] on qtbase. To work around tell Qt build configuration not to use ranameat2 independent of glibc version. Target qtbase does not require this adjustment - there is no pseudo on target. [1] https://git.openembedded.org/openembedded-core/commit/?id=0fb257121b68f38b40c078150db8f7d0979b7ea5 [2] https://github.com/meta-qt5/meta-qt5/issues/187 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
| * qtbase, qtmultimedia: refresh patches to apply cleanly and update them on ↵Martin Jansa2019-04-041-1/+1
| | | | | | | | | | | | github.com/meta-qt5 forks Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: patch build paths from installed filesSamuli Piippo2019-04-031-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All 3rdparty libs and includes are now resolved into full filepaths, which means build paths to the yocto build environment are in module's prl, pri, pc and cmake files. Move existing patching from qtbase to the bbclass so that it's applied to all modules. -L paths are no longer included in the .pc files, remove unneeded patching for those. Task-number: QTBUG-72903 Change-Id: Iae5d150593aef153c46aaf8a3ba22fbafcc9b818 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
| * Upgrade to 5.12.2Mikko Gronoff2019-04-031-8/+3
| | | | | | | | Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
* | Revert "qtbase: Adjust target mkspec settings"Mikko Gronoff2019-05-031-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 77ed8fb225093148583d4d119b89c26d4acc4ee5 & 47d1132b1dc2521299f5041dbb61c8afc29461fd "qtbase: fix target mkspec adjustment" These changes cause QTBUG-75513. Conflicts: recipes-qt/qt5/qtbase_git.bb Task-number: QTBUG-75513 Change-Id: I917bda1b7f6eb70c137070ae0ca0a66e160de523 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5; update submodulesv5.12.3Mikko Gronoff2019-04-111-1/+1
| | | | | | | | | | | | | | | | Update to latest content in Qt 5.12.3 branch Task-number: QTBUG-74623 Change-Id: I2868f80fa7b734729aaeb362e982818dbe760884 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* | qt5: update submodulesMikko Gronoff2019-04-021-1/+1
| | | | | | | | | | | | | | | | Update to latest content in Qt 5.12.3 branch Task-number: QTBUG-74623 Change-Id: I38f29200c051da3d34c768043a1f4d5bd4e5dd6e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2019-03-261-1/+1
| | | | | | | | | | | | | | | | Update to latest content in Qt 5.12(.3) branch Task-number: QTBUG-74623 Change-Id: I58e0d192658129922a463ccbf9e3c0f247c973a0 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12Mikko Gronoff2019-03-201-1/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: 0b0a608 qtbase: let user decide how to link openssl to Qt5 libraries 47d1132 qtbase: fix target mkspec adjustment 87f0462 qttools/cmake: use OE_QMAKE_PATH_EXTERNAL_HOST_BINS fe88b99 nativesdk-qtbase: use rpath for nativesdk Qt tools 92c34de qt5: cleanup mkspecs e117b58 qtbase: Fix test builds with clang/x86_64 6280bef qtscript: add fix for build with gcc 8.3 77ed8fb qtbase: Adjust target mkspec settings 75c7d00 qt5-creator: Do not ship two desktop files 6629131 packagegroup-qt5-toolchain-target: add qtbase-tools Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch recipes-qt/qt5/qtbase_git.bb Change-Id: Iaa69404f2d91bd492eea527548b7cf7c504b7bde
| * qtbase: let user decide how to link openssl to Qt5 librariesFrancesco Giancane2019-03-181-1/+4
| | | | | | | | | | | | | | | | | | Switch from the configure script was extended from -openssl to -openssl-{linked,runtime} so that one can select whether to enable ssl library at linking time or runtime (with dlopen()), or letting the build system decide if no flag is specified. Now with the OPENSSL_LINKING_MODE variable, it is possible to decide which linking mode to be used. Signed-off-by: Francesco Giancane <francesco.giancane@polito.it> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: fix target mkspec adjustmentAndreas Müller2019-03-181-0/+3
| | | | | | | | | | | | mkspecs are not part of qtbase-tools Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 03:37:30 +0000