summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qtyocto/upstream/master' into 5.85.8Mikko Gronoff2017-02-106-8/+57
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qtyocto/upstream/master: 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 Conflicts: recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtwayland_git.bb Change-Id: I8929585c07f462b7ff28c0342386d4114c0c0ee2
| * 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>
| * cmake_qt5.bbclass: add qtbase-native to DEPENDSAnders Darander2017-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building with recipe-specific-sysroot's, qmake can't be found: | CMake Error at WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:32 (message): | The imported target Qt5::Core references the file | | WORKDIR/recipe-sysroot-native/usr/bin/qt5/qmake | | but this file does not exist. Possible reasons include: | | * The file was deleted, renamed, or moved to another location. | | * An install or uninstall procedure did not complete successfully. | | * The installation package was faulty and contained | | WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake | | but not all the files it references. | | Call Stack (most recent call first): | WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake:6 (_qt5_Core_check_file_exists) | WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:163 (include) | WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5/Qt5Config.cmake:31 (find_package) | CMakeLists.txt:56 (find_package) | This is solved by adding qtbase-native to the exported DEPENDS. Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * Upgrade to Qt 5.8Samuli Piippo2017-01-2665-1965/+437
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | qtwebkit: depends on gperf-nativeGordan Markuš2017-01-261-1/+1
| | | | | | | | | | Change-Id: I2c23238906643c358eed511a7af40110569dc643 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-0944-607/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1610-8/+242
|\| | | | | | | | | | | | | | | | | | | | | 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
| * Update Qt5's git repositories to match new locationsVesa Jääskeläinen2016-11-012-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Qt5's repositories in github has changed locations. Qt5 itself and most of its modules are now under: github.com/qt Where as qt5-everywhere-demo is under: github.com/qt-labs Signed-off-by: Vesa Jääskeläinen <dachaac@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: Use existing variables for paths of host toolsAndreas Oberritter2016-11-015-9/+9
| | | | | | | | | | | | | | | | 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>
| * layer.conf: add LAYERVERSION and LAYERDEPENDSJoe Slater2016-10-261-0/+6
| | | | | | | | | | | | | | We just depend on "core". Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qt5: update submodulesSamuli Piippo2016-11-1015-136/+19
| | | | | | | | | | | | | | | | | | 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-2733-443/+156
| | | | | | | | | | | | | | | | | | | | | | | | 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-3049-624/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-129-2/+232
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * qt5-opengles2-test: Add recipeStefan Müller-Klieser2016-09-051-0/+19
| | | | | | | | | | | | | | | | | | This brings back the qt5-opengles2-test. I cloned the vanished repository, as it is a handy and small test application. We use it for our embedded boards. Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * libqofono: import from meta-luneos layerMartin Jansa2016-09-051-0/+39
| | | | | | | | | | | | * we alreadh have libconnman-qt5 here, so it makes sense to import libqofono as well Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * libconnman-qt5: move to recipes-connectivity and don't use MeeGo as prefixMartin Jansa2016-09-052-1/+53
| | | | | | | | 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>
* | Bump version to 5.7.1Samuli Piippo2016-08-241-1/+1
| | | | | | | | | | | | Change-Id: Ia16c6a78e9950792d8749fd18a5c0b3157c50496 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@qt.io>
* | Merge remote-tracking branch 'meta-qt5/master' into 5.7Samuli Piippo2016-08-2371-274/+460
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0571-269/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * qt5-opengles2-test: removeMartin Jansa2016-08-041-19/+0
| | | | | | | | | | | | | | | | | | | | * https://github.com/thp/qt5-opengles2-test no longer exists there is some clone of it in: https://github.com/mer-qa/qt5-opengles2-test but that doesn't have the SRCREV we were using and last commit is from 2014 version 1.0.2 while we had 1.0.4 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * cmake_qt5.bbclass: when using _prepend don't forget to add space at the endDenys Dmytriyenko2016-08-031-1/+2
| | | | | | | | | | | | | | | | | | Previous commit 0717c65abc24d67887c93b773129156f714d033b introduced a bug by using _prepend w/o a space at the end, resulting in corrupted EXTRA_OEMAKE variable in packages that inherit cmake_qt5.bbclass. Signed-off-by: Denys Dmytriyenko <denys@ti.com> 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-21 03:29:22 +0000