summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase_git.bb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | qt5: update submodulesMikko Gronoff2017-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Update submodules to Qt 5.10 Beta (except webengine/chromium left as Alpha version) Change-Id: I2b99e7eb7870e41901bbb9622176a95b0c3a9307 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | qt5: update submodulesMikko Gronoff2017-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Update submodules to Qt 5.10 Alpha Change-Id: I3fe9433c00d5588b179acb676d6db4680596a0df Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | qtbase: respect "ld-is-gold" DISTRO_FEATURESDenys Dmytriyenko2017-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If not set explicitly, some modules like QtWebKit and QtQuick1 can fail: | make[2]: Entering directory '/OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/build/Source' | rm -f libQt5WebKit.so.5.8.0 libQt5WebKit.so libQt5WebKit.so.5 libQt5WebKit.so.5.8 | linking ../lib/libQt5WebKit.so.5.8.0 | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_end' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_end' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `_end' | collect2: error: ld returned 1 exit status | Makefile.api:92: recipe for target '../lib/libQt5WebKit.so.5.8.0' failed | make[2]: *** [../lib/libQt5WebKit.so.5.8.0] Error 1 | make[2]: Leaving directory '/OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/build/Source' | Makefile.QtWebKit:44: recipe for target 'sub-api-pri-make_first-ordered' failed | make[1]: *** [sub-api-pri-make_first-ordered] Error 2 Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit 3ae86cb32edd1449f702e0a094929ae9b21ce191) Task-number: QTBUG-63083 Change-Id: Iac8a11954a64b666caf5dd7fc0e5e631611f9d01 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | qt5: update submodulesMikko Gronoff2017-09-051-3/+2
| | | | | | | | | | | | | | | | | | | | | Update submodules, change from dev to 5.10 branch Change-Id: Iaabd27a1b2db2a3d28d2f3d4377d1386a86646c2 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | qt5: update submodulesSamuli Piippo2017-06-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Using WebKit from commit before Tokarev's wip merge Change-Id: Ifd7606027698ad9500cd40529dfc179faa9e8e05 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | qt5: update to Qt 5.10 from dev branchSamuli Piippo2017-06-061-1/+1
|/ / | | | | | | | | | | | | | | Use dev branch to build Qt 5.10. Change-Id: Ib4bba18a99e95c63b3280b83e9bf19de29b466a8 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-05-221-1/+1
| | | | | | | | | | | | | | Update submodules to 5.9.0 RC (snapshot 1) Change-Id: I2a16101eea7fe7ae506395050f2f787a788a7a66 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-05-081-1/+1
| | | | | | | | | | | | | | | | * Update 5.9.0 submodules to Beta 4 (snapshot 1) * License file cleanup for several recipes Change-Id: Idc0b99f29a5feacf264fc668bc70129e2ed2458e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-04-271-1/+1
| | | | | | | | | | | | | | * Update submodules to 5.9.0 Beta 3 (snapshot 1) Change-Id: I7964422570d0294c40ff9da82959f7cfdc346d15 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | * 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>
* | qt5: update submodulesMikko Gronoff2017-04-121-1/+1
| | | | | | | | | | | | | | | | | | * 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-051-1/+1
| | | | | | | | | | | | | | * Update submodules to 5.9.0 Beta RC2 Change-Id: Ideadb932f699118b513a612a35a9c8e107d7ed0f Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-03-311-1/+1
| | | | | | | | | | | | | | | | * 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-291-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * 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-261-1/+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>
* | qt5: update submodules to 5.9.0 pre-beta snapshot 2Mikko Gronoff2017-03-231-3/+2
| | | | | | | | | | | | | | * Removed xrender packageconfig from qtbase Change-Id: Ic6f2d4180780e7d45ceb9f7dea90d2ad315f17e9 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodules to 5.9.0 pre-beta snapshotMikko Gronoff2017-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | * 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-171-1/+1
| | | | | | | | | | | | | | | | * 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-221-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qtyocto/5.8' into 5.9Mikko Gronoff2017-02-151-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * 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-261-71/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * qt5: Use existing variables for paths of host toolsAndreas Oberritter2016-11-011-2/+2
| | | | | | | | | | | | | | | | Makes it possible to install qmake into ${bindir} without setting QT_DIR_NAME = "". Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qt5: Upgrade to Qt 5.9.0Samuli Piippo2017-02-131-4/+2
| | | | | | | | | | | | 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-201-1/+1
| | | | | | | | | | Change-Id: Idc8d2c2437851f6e3c562351aa09e6ecdeec0f74 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesMikko Gronoff2017-01-111-1/+1
| | | | | | | | | | Change-Id: Iee3607e25b8d897df8346963198a36001f2936a0 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | 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>
* | qt5: update submodulesMikko Gronoff2016-12-301-1/+1
| | | | | | | | | | 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>
* | qt5: update submodulesSamuli Piippo2016-12-131-2/+1
| | | | | | | | | | | | | | | | | | | | 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-091-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | qt5: update submodulesSamuli Piippo2016-11-101-2/+1
| | | | | | | | | | | | | | | | | | Remove unneeded patch qtbase and rework qtwayland recipe to build qtwaylandscanner without need for patch. Change-Id: I41d5c020cbe853a52896b85824990c66cc97d6bb Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesSamuli Piippo2016-10-271-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | Add more PACKAGECONFIGs for qtbase. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk). Previous workaround removed and new ones added for: QTBUG-56656, QTBUG-56666 Reduce number of patches applied to qtbase. Change-Id: I6b82fd46aaade4f14cf61e29adb7fc984070333b Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'gerrit/upstream/master' into 5.8Samuli Piippo2016-10-251-0/+3
|\| | | | | | | | | | | | | | | | | | | * gerrit/upstream/master: qtbase: avoid qmake errors due to missing oe-device-extra.pri Conflicts: recipes-qt/qt5/qtbase_git.bb Change-Id: Ib6975f5a7966ffbf9f96d40d69b89f226cd59040
| * qtbase: avoid qmake errors due to missing oe-device-extra.priJonathan Liu2016-09-111-0/+3
| | | | | | | | | | | | | | | | An empty oe-extra-extra.pri file is created if it does not exist to suppress qmake errors. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qt5: update to Qt 5.8Samuli Piippo2016-09-301-49/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Change-Id: I4c937c1acb3d204ac4560090cab3d0fc7e0e815a Reviewed-by: Risto Avila <risto.avila@qt.io> Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'meta-qt5/master' into 5.7Samuli Piippo2016-09-121-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | * meta-qt5/master: qt5-opengles2-test: Add recipe libqofono: import from meta-luneos layer libconnman-qt5: move to recipes-connectivity and don't use MeeGo as prefix qtdeclarative: add upstream patch to fix QtQml crash with GCC 6 qtvirtualkeyboard: add PACKAGECONFIG options qtbase: avoid QA warning if PACKAGECONFIG_RELEASE = "debug" qtbase: Fix build with QT_NO_OPENGL Change-Id: I5b1efc0de3fdf0d4fe98135c0cc08ddb3d03293b
| * qtbase: avoid QA warning if PACKAGECONFIG_RELEASE = "debug"Jonathan Liu2016-08-311-0/+1
| | | | | | | | | | | | | | | | If PACKAGECONFIG_RELEASE = "debug", an invalid PACKAGECONFIG QA warning is shown. To avoid this, we add dummy debug PACKAGECONFIG. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: Fix build with QT_NO_OPENGLJohannes Pointner2016-08-311-0/+1
| | | | | | | | | | | | | | This fixes the build of qtbase without opengl support Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | Merge remote-tracking branch 'meta-qt5/master' into 5.7Samuli Piippo2016-08-231-10/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * meta-qt5/master: qtbase: fix drm dependency for eglfs PACKAGECONFIG qt5: upgrade to latest revisions in 5.7 branch qt5-opengles2-test: remove cmake_qt5.bbclass: when using _prepend don't forget to add space at the end qtquick1: fix qtwebkit support qtbase: add PACKAGECONFIG for journald logging qtserialbus: add recipe qtwayland: Rework recipe to allow PACKAGECONFIG use qtwayland: add dependency on libxcomposite qtcharts: Add dependency on qtmultimedia packagegroup-qt5-toolchain-target.bb: Add qtdeclarative-tools to RDEPENDS. Conflicts: classes/qmake5_base.bbclass recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick1_git.bb recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsystems_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtwayland-native_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: Ia3d047984b6249526d6bf14373114d0fc734c458
| * qtbase: fix drm dependency for eglfs PACKAGECONFIGMartin Jansa2016-08-081-1/+1
| | | | | | | | | | | | * there isn't virtual/drm, just drm Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: upgrade to latest revisions in 5.7 branchMartin Jansa2016-08-051-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * LIC_FILES_CHKSUM were changed because of this small change: commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6 Author: Sze Howe Koh <szehowe.koh@gmail.com> Date: Tue Jun 14 19:12:35 2016 +0800 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" * -no-nis option was removed from qtbase in: commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db Author: Ralf Nolden <nolden@kde.org> Date: Fri May 20 22:03:39 2016 +0200 Cleanup NIS support leftover from Qt 3/4 * allow to disable eglfs independently from gles2, because eglfs-egldevice may be autodetected when libdrm was built before qtbase since this upstream commit: commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0 Author: Ralf Nolden <nolden@kde.org> Date: Tue May 17 12:38:44 2016 +0200 Make eglfs-egldevice check work with pkgconfig as well and then it fails to build, because libdrm could be removed from sysroot and drm.h is missing. * recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch was resolved in upstream commit: commit 26229cfa0b729313893af5674d604e8692dbb946 Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Date: Tue Apr 26 15:08:34 2016 +0200 QDeclarativeTextInput: update API to use setBlinkingCursorEnabled Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: add PACKAGECONFIG for journald loggingChristoph Settgast2016-07-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Note from qtbase configure script: If your users intend on developing applications if logging to journal is enabled, ensure that the IDEs they use either set QT_LOGGING_TO_CONSOLE to 1 or the IDE is able to read the logged output from journald. Signed-off-by: Christoph Settgast <christoph.settgast@methodpark.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qtbase: fix cmake pathsSamuli Piippo2016-06-061-2/+1
| | | | | | | | | | | | | | | | | | Bring back patch for cmake to use OE_QMAKE_PATH_EXTERNAL_HOST_BIN to determine path to host binaries. Resolves QA Issue: Qt5Core.pc failed sanity test (tmpdir) in path. Change-Id: I55d4f390f24c6e223f3b1a0bded57337233c23c0 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | Merge remote-tracking branch 'meta-qt5/master' into 5.7Samuli Piippo2016-06-031-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * meta-qt5/master: qtchooser: add new recipe qtvirtualkeyboard: add recipe qtdeclarative-render2d: add recipe qtdatavis3d: add recipe qtcharts: add recipe licenses: update technology preview license to match upstream cmake_qt5: prepend the Qt5 specific CMake variables to EXTRA_OECMAKE qtbase: add patch to make Qt5Config modules behave better with cmake builds qt5: Allow disabling SHA validation for branch qtbase: Reorder EGL libraries from pkgconfig and defaults: Change-Id: If0804ddb8c506e6f0d1ec32251cca6620dd97abe
| * qtbase: add patch to make Qt5Config modules behave better with cmake buildsPascal Bach2016-05-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a project if using the cmake bbclass and the CMakeLists.txt file uses find_package to find Qt5 and error like this is produced: | The imported target "Qt5::Core" references the file | | "/qmake" | | but this file does not exist. Possible reasons include: This is because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is only set in the cmake_qt5 bblcass. To make it work better in that case the Qt5Config files check if OE_QMAKE_PATH_EXTERNAL_HOST_BINS is defined and bail out if not. For CMake this is the same as Qt5 wasn't found. Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>