summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
Commit message (Collapse)AuthorAgeFilesLines
...
* qt5-creator: Link with libexecinfo on muslKhem Raj2017-07-142-0/+24
| | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtvirtualkeyboard: Include sys/time.hKhem Raj2017-07-142-0/+29
| | | | | | | Fixes build on musl Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: Fix build on muslKhem Raj2017-07-1415-1/+565
| | | | | | | import needed chromium patches from meta-browser Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-creator: Fix build with NO_ACCESSIBILITYKhem Raj2017-07-143-0/+81
| | | | | | | Also add missing headers in sources Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase-native: Fix qdbuscpp2xml segfaultKhem Raj2017-07-122-80/+0
| | | | | | | | | 0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone was causing qdbuscpp2xml to simply segfault on simple invocation Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-ptest.inc: append do_populate_sysroot only for targetMartin Jansa2017-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * otherwise it breaks e.g. qtxmlpatterns-native build as shown in: http://errors.yoctoproject.org/Errors/Details/147039/ ERROR: Error executing a python function in exec_python_func() autogenerated: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_python_func() autogenerated', lineno: 2, function: <module> 0001: *** 0002:do_populate_sysroot(d) 0003: File: 'TOPDIR/openembedded-core/meta/classes/staging.bbclass', lineno: 128, function: do_populate_sysroot 0124: 0125:python do_populate_sysroot_setscene () { 0126: sstate_setscene(d) 0127:} *** 0128:addtask do_populate_sysroot_setscene 0129: 0130:def staging_copyfile(c, target, dest, postinsts, seendirs): 0131: import errno 0132: File: 'TOPDIR/openembedded-core/meta/classes/staging.bbclass', lineno: 114, function: copyFiles 0110: 0111:do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" 0112:do_populate_sysroot[vardepsexclude] += "MULTI_PROVIDER_WHITELIST" 0113: *** 0114:POPULATESYSROOTDEPS = "" 0115:POPULATESYSROOTDEPS_class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" 0116:POPULATESYSROOTDEPS_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" 0117:do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" 0118: Exception: FileNotFoundError: [Errno 2] No such file or directory: 'TOPDIR/tmp-glibc/work/x86_64-linux/qtxmlpatterns-native/5.8.0+gitAUTOINC+9f7e01b582-r0/sysroot-destdir/usr/' Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: fix build with gcc7Martin Jansa2017-07-125-22/+208
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtquickcontrols2: fix compilation of examples/texteditorSteffen Sledz2017-07-122-0/+32
| | | | | | | | | git/examples/quickcontrols2/texteditor/documenthandler.cpp:284:18: error: invalid use of incomplete type 'class QDebug' qWarning() << "load() called before DocumentHandler has QQmlEngine"; Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtquick1: add ptestHuang Qiyu2017-07-122-0/+7
| | | | | | | Add ptest for qttools by using provided testsuite in qtquick1. Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtdeclarative: add ptestHuang Qiyu2017-07-122-0/+6
| | | | | | | Add ptest for qttools by using provided testsuite in qtdeclarative. Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtxmlpatterns: add ptestHuang Qiyu2017-07-122-0/+8
| | | | | | | Add ptest for qttools by using provided testsuite in qtxmlpatterns. Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: add qt5-ptest.incHuang Qiyu2017-07-121-0/+62
| | | | | | | | | | | | | | | | | Add qt5-ptest.inc file for qt ptest related tasks 1) Rewrite do_compile_ptest task for qt 2) Add new do_compile_ptest_base and task do_install_ptest 3) Write do_populate_sysroot_append to resolve do_compile_ptest_base problem in yocto2.3 The compile error log is shown as follow: cd auto/ && ( test -e Makefile || /yocto/work001/fnst/huangqy/work_qt/build/tmp/work/i586-p oky-linux/qtxmlpatterns/5.8.0+gitAUTOINC+9f7e01b582-r0/recipe-sysroot-native/usr/bin/qt5/qmake -o M akefile /yocto/work001/fnst/huangqy/work_qt/build/tmp/work/i586-poky-linux/qtxmlpatterns/5.8.0+gitA UTOINC+9f7e01b582-r0/git/tests/auto/auto.pro ) && make -f Makefile Project ERROR: Could not find feature xml-schema. Makefile:42: recipe for target 'sub-auto-make_first' failed Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: add PACKAGECONFIG for webrtcDaniel Mack2017-07-011-0/+1
| | | | | Signed-off-by: Daniel Mack <daniel@zonque.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Revert "qttools: DEPENDS on icu"Martin Jansa2017-06-271-1/+1
| | | | | | | | This reverts commit 6a42ca074f2fea52985049d49057c178363d847c. http://lists.openembedded.org/pipermail/openembedded-devel/2017-June/113308.html Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qttools: DEPENDS on icuMing Liu2017-06-221-1/+1
| | | | | | | | | | This fixes a following QA issue: | QA Issue: nativesdk-qtbase-tools rdepends on nativesdk-libicui18n, but it isn't a build dependency. | QA Issue: nativesdk-qtbase-tools rdepends on nativesdk-libicuuc, but it isn't a build dependency. | QA Issue: nativesdk-qtbase-tools rdepends on nativesdk-libicudata, but it isn't a build dependency. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: respect "ld-is-gold" DISTRO_FEATURESDenys Dmytriyenko2017-06-201-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>
* qttools: add ptestHuang Qiyu2017-04-122-0/+21
| | | | | | | Add ptest for qttools by using provided testsuite. Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwayland: fix initial window property valuesGordan Markuš2017-04-122-1/+39
| | | | | | | | This fixes a bug where there is nothing rendered on the QtWayland surface due to missing window properties. Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtdeclarative: fix memory leaksGordan Markuš2017-04-124-0/+169
| | | | | | | | | * Fix QQmlExpression leaking QQmlError objects * Fix V4 Javascript Engine creating duplicate entries * Fix memory leak in QQuickWindowPrivate::deliverTouchAsMouse Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> 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>
* 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>
* 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>
* 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>
* 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>
* 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-2662-1920/+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: Use existing variables for paths of host toolsAndreas Oberritter2016-11-014-8/+8
| | | | | | | | 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>
* qtwayland: Fix building of QWaylandIntegration if some Qt5 features are ↵Vesa Jääskeläinen2016-11-013-0/+158
| | | | | | | | | | | | | disabled. QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL, QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and QT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland. Signed-off-by: Vesa Jääskeläinen <dachaac@gmail.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: Add gperf-native to DEPENDSFabio Berton2016-10-261-0/+1
| | | | | | | | | | | | | | | | | Fix error: FAILED: cd ../build/tmp/work/cortexa9hf-neon-mx6qdl-linux-gnueabi/qtwebengine/ 5.6.99+5.7.0-beta+gitAUTOINC+dbf7dd2742_29c16917b3-r0/git/src/3rdparty/chromium/ third_party/WebKit/Source/platform; gperf "--key-positions=*" -D -s 2 ColorData.gperf "--output-file=../build/tmp/work/cortexa9hf-neon-mx6qdl-linux- gnueabi/qtwebengine/5.6.99+5.7.0-beta+gitAUTOINC+dbf7dd2742_29c16917b3-r0/git/ src/core/Release/gen/blink/platform/ColorData.cpp" /bin/sh: gperf: command not found ninja: build stopped: subcommand failedP Change-Id: Ic28d0ac72fcbce8054638a3168b5d6a34bc129b5 Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtmultimedia: fix conflicting declaration errorWenlin Kang2016-10-262-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error info is as the follow: | In file included from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopengl.h:123:0, | from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglshaderprogram.h:41, | from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/qsgmaterial.h:38, | from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/QSGMaterial:1, | from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.h:40, | from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:37: | /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglext.h:474:19: error: conflicting declaration 'typedef ptrdiff_t GLsizeiptr' | typedef ptrdiff_t GLsizeiptr; | ^ | In file included from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:34:0: | /.../sysroots/fsl-imx6/usr/include/GLES2/gl2.h:67:25: note: previous declaration as 'typedef khronos_ssize_t GLsizeiptr' | typedef khronos_ssize_t GLsizeiptr; | ^ | In file included from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopengl.h:123:0, | from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglshaderprogram.h:41, | from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/qsgmaterial.h:38, | from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/QSGMaterial:1, | from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.h:40, | from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:37: | /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglext.h:475:19: error: conflicting declaration 'typedef ptrdiff_t GLintptr' | typedef ptrdiff_t GLintptr; | ^ | In file included from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:34:0: | /.../sysroots/fsl-imx6/usr/include/GLES2/gl2.h:68:26: note: previous declaration as 'typedef khronos_intptr_t GLintptr' | typedef khronos_intptr_t GLintptr; | ^ Here, use lgl2.h instead of gl2.h and gl2ext.h, fix the "conflicting declaration" error. Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* 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>
* qtdeclarative: add upstream patch to fix QtQml crash with GCC 6Jonathan Liu2016-08-312-0/+45
| | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtvirtualkeyboard: add PACKAGECONFIG optionsSamuli Piippo2016-08-311-1/+41
| | | | | | | Add all available configurations to PACKAGECONFIGs. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* 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-312-0/+34
| | | | | | | 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>
* 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-0568-269/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* qtquick1: fix qtwebkit supportAlexandre Belloni2016-08-031-2/+4
| | | | | | | | | | | 40b7a93a3c6cf05136c606824c1cea848b75bcb6 ("qtquick1: allow to disable qtwebkit support") allowed to disable qtwebkit but actually disabled it in every cases. Use the same mechanism as qttools to implement the feature. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-23 22:44:56 +0000