summaryrefslogtreecommitdiffstats
path: root/recipes-qt
Commit message (Collapse)AuthorAgeFilesLines
* qt5: update submodulesMikko Gronoff2017-04-1915-14/+27
| | | | | | | | | | | * Updates submodules: 5.9.0 Beta 2 (snapshot 1) -> (snapshot 2) * Include more subdirs for .qmlc packaging in qt5.inc * package qtquickcontrols specific files in qtquickcontrols recipe Change-Id: Ia30502bfae0a3dcc364cb423cc53fec3558437c4 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9Mikko Gronoff2017-04-123-7/+37
|\ | | | | | | | | | | | | | | | | * upstream/master: qtchooser: respect LDFLAGS qtbase-native: create empty oe-device-extra.pri qtwayland: update build without xkbcommon-evdev Change-Id: Icafabee07696be98fd6e4fa145f42df6f53863d2
| * qtchooser: respect LDFLAGSMartin Jansa2017-04-101-1/+1
| | | | | | | | | | | | | | | | | | * fixes: qtchooser-39+git4717841185d34bbe450e3b24445f2d35e3325a6a: No GNU_HASH in the elf binary: '/tmp/work/armv5te-oe-linux-gnueabi/qtchooser/39+git4717841185d34bbe450e3b24445f2d35e3325a6a-r0/packages-split/qtchooser/usr/bin/qtchooser' [ldflags] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase-native: create empty oe-device-extra.priGordan Markuš2017-04-101-0/+3
| | | | | | | | | | | | | | | | | | Suppress multiple occurrences of the same warning while configuring and compiling qtbase-native and nativesdk-qtbase. WARNING: Unable to find file git/mkspecs/linux-oe-g++/../oe-device-extra.pri Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwayland: update build without xkbcommon-evdevGordan Markuš2017-04-101-6/+33
| | | | | | | | | | | | | | | | | | | | Update patch that enables building qtwayland without xkbcommon-evdev. Building qtwayland without xkbcommon-eved with the previous patch resulted in the following error: error: undefined reference to 'xkb_state_mod_name_is_active' Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qt5: update submodulesMikko Gronoff2017-04-1221-23/+25
| | | | | | | | | | | | | | | | | | * Updates submodules 5.9.0 Beta --> 5.9.0 Beta 2 (snapshot 1) * Package new qml cache files (.qmlc) introduced by qtgraphicaleffects module update Change-Id: I726e092db2dd1e9057d9a79321b38c69623f1077 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | qt: update submodulesMikko Gronoff2017-04-0516-16/+16
| | | | | | | | | | | | | | * Update submodules to 5.9.0 Beta RC2 Change-Id: Ideadb932f699118b513a612a35a9c8e107d7ed0f Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-03-3120-47/+20
| | | | | | | | | | | | | | | | * Update submodules to 5.9.0 Beta RC1 * Removed obsolete temporary build fix patch from qt3d Change-Id: Iee1e0c64792ee17fce947d9e68a143b09e77c31a Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9Mikko Gronoff2017-03-296-2/+94
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: nativesdk-qtbase: pass -no-icu for deterministic builds qtwebengine: show progress for do_compile packagegroup-qt5-toolchain-target: add qtquickcontrols2 package qtwebengine: add commercial license qtbase-native; do not build qdbuscpp2xml and qdbusxml2cpp bootstrapped packagegroup-qt5-toolchain-target: Add QtSerialBus to meta-toolchain-qt5. qtbase: PACKAGECONFIG[gtk] change gtk+ -> gtk+3 in dependencies qtbase: remove absolute binary paths from mkspec files qtbase-native: nativesdk-qtbase: remove patch that breaks mkspec setting for SDK Change-Id: I99806099ccf7af78d61cba2df96b436cea76ddac
| * nativesdk-qtbase: pass -no-icu for deterministic buildsDenys Dmytriyenko2017-03-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Similar to qtbase-native. Otherwise it may fail with this error, if icu is not yet staged: | .../git/src/corelib/codecs/qicucodec.cpp:53:26: fatal error: unicode/ucnv.h: No such file or directory | #include "unicode/ucnv.h" | ^ | compilation terminated. Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebengine: show progress for do_compileAndreas Müller2017-03-161-0/+2
| | | | | | | | | | | | | | | | This was stolen from meta-oe / meson.bbclass - qtwebengine uses ninja for build too. Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * packagegroup-qt5-toolchain-target: add qtquickcontrols2 packageNiels Kolthoff2017-03-161-0/+3
| | | | | | | | | | Signed-off-by: Niels Kolthoff <nkolthoff@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebengine: add commercial licenseGordan Markuš2017-03-161-1/+1
| | | | | | | | | | Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase-native; do not build qdbuscpp2xml and qdbusxml2cpp bootstrappedAndreas Müller2017-03-072-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes build of kde's baloo. That project converts a header file using QDBusMessage to xml which won't work. More details can be found at [1]. Problems with qdbus-helpers came up with update Qt5.7->Qt.5.8 where we use bootstrapped qtbase-native for the first time due to qtbase's new configuration and for reduced build time. [1] http://lists.qt-project.org/pipermail/development/2017-February/028756.html Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * packagegroup-qt5-toolchain-target: Add QtSerialBus to meta-toolchain-qt5.Yann PERON2017-03-071-0/+2
| | | | | | | | | | | | | | Dynamic library Qt5SerialBus.so was not created in toolchain file system when I built bitbake meta-toolchain-qt5 Signed-off-by: Yann PERON <yann.peron@optimatic.fr> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: PACKAGECONFIG[gtk] change gtk+ -> gtk+3 in dependenciesAndreas Müller2017-03-011-1/+1
| | | | | | | | | | | | | | | WARNING: QA Issue: qtbase-plugins rdepends on gtk+3, but it isn't a build dependency, missing gtk+3 in DEPENDS or PACKAGECONFIG? [build-deps] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: remove absolute binary paths from mkspec filesDaniel Mack2017-02-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running 'bitbake -c populate_sdk' on an image that has qt5webkit enabled, the uikit feature is enabled in qtbase, which then fails to install with error: qtbase-mkspecs-5.8.0+git0+49dc9aa409-r0 conflicts with /usr/bin/perl The culprit for this is /usr/lib/qt5/mkspecs/features/uikit/devices.pl, which has #!/usr/bin/perl hardcoded. Fix this in a similar way other recipes do it as well and strip out these bits at install time. Signed-off-by: Daniel Mack <daniel@zonque.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase-native: nativesdk-qtbase: remove patch that breaks mkspec setting for SDKSchrempf Frieder2017-02-263-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | The patch 0008-configure-paths-for-target-qmake-properly.patch seems to be intended for the target, not for native/nativesdk, as it breaks the mkspec setting (sets linux-g++ instead of linux-oe-g++) by default. This issue is also described here: https://github.com/graugans/meta-udoo/issues/20#issuecomment-261241783 Signed-off-by: Frieder Schrempf <frieder.schrempf@exceet.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qtwebengine: update to latest versionSamuli Piippo2017-03-297-145/+9
| | | | | | | | | | | | | | | | | | | | | | Includes fix for Intel NUC build, where target and host have the same architecture. Remove no longer required patches. Last chromium patch left in place as it might still be required. Task-number: QTBUG-59768 Change-Id: I2c598926e56c07224fffb43af98834d225b10bad Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qtwebengine: make WORKDIR shorterSamuli Piippo2017-03-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja may fail when the build directory is too long: ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\ interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\ 6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\ .0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\ le.rsp): Unable to create file. File name too long Change-Id: Ib5c1a357328dbae6312f6e9b0a40bbaaa2d27dea Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodules to 5.9.0 pre-beta snapshot 2Mikko Gronoff2017-03-2324-27/+26
| | | | | | | | | | | | | | * Removed xrender packageconfig from qtbase Change-Id: Ic6f2d4180780e7d45ceb9f7dea90d2ad315f17e9 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qtwebengine: update to use gn based build systemSamuli Piippo2017-03-223-47/+93
| | | | | | | | | | | | | | | | | | | | QtWebEngine switched from gyp to gn when generating ninja files. Parts of the build need to be done using host toolchain, which needs to be patched to work with bitbake builds. Change-Id: I5241f215fbaf49a2dedd8699b7984de33f38b5d3 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | qt5: update submodules to 5.9.0 pre-beta snapshotMikko Gronoff2017-03-2036-182/+61
| | | | | | | | | | | | | | | | | | | | | | * Obsolete qttools patch removed (lucene removed from qttools) * 2 obsolete qtwebkit patched removed * Added a header inclusion patch to qt3d to fix build break Change-Id: I11e4ae66051322bcd77ca0884298fc804d2d26f8 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-03-1732-32/+39
| | | | | | | | | | | | | | | | * qtlocation module has a new 3rd party submodule "mapbox-gl-native" added under src/3rdparty folder. Change-Id: Ie5b21245bcf61b42b044e8121368d28b96a824f8 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9Mikko Gronoff2017-02-225-1/+54
|\| | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: populate_sdk_qt5: use _append operator qmake5_base.bbclass: set qt.conf by environment variable again Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase_git.bb Change-Id: I8f47b06f1143be1a399ab4e8d2aa9cf32df4ad25
| * qmake5_base.bbclass: set qt.conf by environment variable againAndreas Müller2017-02-105-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt update to 5.8 caused fallout in meta-qt5-extra. It turned out that qmake pulled in many pointers to native sysroot. Native sysroot is qmake's default in case no configuration file qt.conf is set. The problem with the new way of setting qt.conf by cmd parameter is that is has to be set explicitly. For instance all the packages coming from [1] use autotools for configuration. These ask qmake for paths during configuration and build further Makefiles during compile. To patch these for additional cmd parameter is nasty business. Setting qt.conf when building all qtbase's causes errors during configuration. To fix this we set the filename to a non existent file so that Qt's default is used. This dirty hack was necessary because there was no way found to export an empty variable OE_QMAKE_QTCONF_PATH. This patch was tested by building huge parts of meta-qt5-extra. The meta-layers did not yet contain oe-core's recipe-specific-sysroot changes so master build might fail for missing dependencies. [1] http://www.rncbc.org/drupal/ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qt5: fix qtenginio build errorMikko Gronoff2017-02-211-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | bitbake meta-toolchain-qt5 command produces error for enginio module: "QA Issue: Enginio.pc failed sanity test (tmpdir)". - Modify sed command in qmake5_base.bbclass to include *.pc files instead of Qt5*.pc, thus including Enginio.pc. - Remove now obsolete install_append section from qtenginio_git.bb Change-Id: Ia517f15104d242632408ec39f7826107dc3e93f6 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'qtyocto/5.8' into 5.9Mikko Gronoff2017-02-155-8/+57
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qtyocto/5.8 (upstream/master): qtwebkit: depends on gperf-native qtwebengine: disable generate_character_data qtwayland: fix build without xkbcommon-evdev qtwayland: Add libxkbcommon in the dependencies qtbase: create empty oe-device-extra.pri cmake_qt5.bbclass: add qtbase-native to DEPENDS Upgrade to Qt 5.8 qtbase: Remove comments about ICU and QtWebKit qtwebkit: Always enable icu in QT_CONFIG qtwebengine: use QT_GIT_PROTOCOL variable Change-Id: Idf617e8301dfa820b8fbbbdb2e09e53d18bcc8ae
| * qtwebkit: depends on gperf-nativeGordan Markuš2017-02-071-1/+1
| | | | | | | | | | Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebengine: disable generate_character_dataMartin Jansa2017-02-031-1/+1
| | | | | | | | | | | | | | * qtwebengine 5.8 fails to build it, because it mixes binaries for x86_64 host and x86 target when building for qemux86 on 64bit host https://bugreports.qt.io/browse/QTBUG-57705 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwayland: fix build without xkbcommon-evdevMartin Jansa2017-02-022-0/+47
| | | | | | | | | | | | | | * xkbcommon-evdev isn't enabled in default qtbase PACKAGECONFIG * use patch from https://bugreports.qt.io/browse/QTBUG-57767 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwayland: Add libxkbcommon in the dependenciesHerve Jourdain2017-02-021-0/+1
| | | | | | | | | | | | | | | | xkb should be optional, but it's not for the moment, so add it to the dependencies. Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: create empty oe-device-extra.priHerve Jourdain2017-02-021-0/+3
| | | | | | | | | | | | | | | | During configure, it complains it can't find oe-device-extra.pri, but it doesn't result in any error. Fix it, though, just in case. Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * Upgrade to Qt 5.8Samuli Piippo2017-01-2663-1921/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Update PACKAGECONFIGs for qtbase to match current configure options. The new Qt configuration system [1] can be used with a new variable EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature arguments. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk) without need for additional patch. Recipes for new Qt modules: QtSCXML, QtNetworkAuth, QtGamepad. Removes qtdeclarative-render2d [1] https://www.mail-archive.com/development@qt-project.org/msg25257.html Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: Remove comments about ICU and QtWebKitAndreas Oberritter2016-12-171-5/+0
| | | | | | | | | | | | | | | | QtWebKit doesn't depend on icu in qtbase. It just didn't enable it manually before. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebkit: Always enable icu in QT_CONFIGAndreas Oberritter2016-12-171-0/+3
| | | | | | | | | | | | | | Allow qtwebkit to be built even if qtbase was configured without icu. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebengine: use QT_GIT_PROTOCOL variableJanek Filus2016-12-171-1/+1
| | | | | | | | | | | | Signed-off-by: Daniel Ottiger <daniel.ottiger@ch.schindler.com> Signed-off-by: Janek Filus <janek.filus@bytesatwork.ch> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qt5: Upgrade to Qt 5.9.0Samuli Piippo2017-02-1340-257/+110
| | | | | | | | | | | | Change-Id: I446186476047563fd5377662d1827c45c2394140 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesv5.8.0Mikko Gronoff2017-01-204-4/+4
| | | | | | | | | | Change-Id: Idc8d2c2437851f6e3c562351aa09e6ecdeec0f74 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-01-1112-13/+13
| | | | | | | | | | Change-Id: Iee3607e25b8d897df8346963198a36001f2936a0 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qtscxml: patch cmake files to work with external host bin pathsSamuli Piippo2017-01-102-0/+30
| | | | | | | | | | | | | | Using the same approach as with cmake files in qtbase. Change-Id: I8d74eb2c7456a648e17e07a271499f1b0b01c637 Reviewed-by: Volker Krause <volker.krause@kdab.com>
* | qtbase: use virtual/mesa for libgbmSamuli Piippo2017-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | Mesa is still the main source for libgbm. Although there are other providers for it (TI,renesas) there is still no virtual/libgbm that could be used. In those cases, the PACKAGECONFIG needs to be overridden to change the dependency. Change-Id: Ifbe176fda23ededd6e0c564aaca1cbbc2fac82e8 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Add QtNetworkAuth and QtSCXML modulesSamuli Piippo2017-01-092-0/+33
| | | | | | | | | | | | Change-Id: I94a2a24eb7395c78c6b02642ccdd15b935093406 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qtwayland: fix typoMikko Gronoff2017-01-051-1/+1
| | | | | | | | | | | | | | a dash missing on one line Change-Id: I6757fd377c5dd8caf42a893c0ace11ac81d54f60 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2016-12-3016-17/+17
| | | | | | | | | | Change-Id: I1ffc72225816505274ac847f8e18c2fc56b9428e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qtbase: correct dependency for gbmSamuli Piippo2016-12-281-1/+1
| | | | | | | | | | | | Change-Id: Ic8a8b032f849cfa1e5b69e80117bc8b021ea2c2a Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | QtVirtualKeyboard: Add Romanian packageconfigGordan Markuš2016-12-161-0/+1
| | | | | | | | | | | | Change-Id: Ide686ddcdd736ed785ee85a5dc25ff3d29505801 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesSamuli Piippo2016-12-1321-213/+20
| | | | | | | | | | | | | | | | | | | | QOpenGLPaintDevice patch doesn't apply anymore, but removed since it adds new API and should be submitted to Qt. Change-Id: I548d61c6f9ffbafc5aa1516e66cae3cf5b0d935f Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesSamuli Piippo2016-12-0943-605/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New configuration system is now used for more modules, so add new EXTRA_QMAKEVARS_CONFIGURE variable that can be used for configure modules with -[no-]feature flags. SHA1s are now from the release 5.8.0 branches, so need to add "nobranch=1" option so that there is no build break when release branches are removed. Add recipe for QtGamepad module, it's already used by Qt3D. Change-Id: I152b3b66b68c802d07445f4a7f1e81802308418e Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'qtyocto/upstream/master' into 5.8Samuli Piippo2016-11-168-6/+233
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: classes/qmake5_base.bbclass recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtwayland-native_git.bb recipes-qt/qt5/qtwayland_git.bb Change-Id: I4d383e069efb8f64b7469e414ab368c9ca0ff1ad