Commit Graph

32 Commits

Author SHA1 Message Date
Martin Jansa
07a54bf2a9 qt5: upgrade to 5.15 rc1
* use latest revisions in 5.15 branches

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2020-05-11 17:03:44 +02:00
Martin Jansa
d6b6838e55 qt5: upgrade to 5.15 beta4
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2020-04-21 18:31:19 +02:00
Martin Jansa
20ae10f00f qt5: upgrade to 5.15 beta2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2020-04-03 14:20:48 +02:00
Martin Jansa
a38953a6e9 qt5: upgrade to latest revisions in 5.15 branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2020-03-18 18:03:49 +01:00
Martin Jansa
444053735f qt5: upgrade to latest revisions in 5.15 branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2020-03-18 18:03:49 +01:00
Martin Jansa
8cadcbcb52 qt5: upgrade to 5.14.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2020-01-27 14:36:20 +01:00
Samuli Piippo
ca649e3f6f qt5: Update to Qt 5.14.0
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
2020-01-11 14:03:48 +01:00
Martin Jansa
81156172a8 qt5: Upgrade to Qt 5.13.2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-10-31 15:26:55 +00:00
Samuli Piippo
8d2e1b4019 qt5: Upgrade to Qt 5.13.0
Update recipes for Qt 5.13.0, add new recipes for Qt modules qtcoap
and qtlottie, and remove qtcanvas3d.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
2019-07-15 13:58:40 +00:00
Martin Jansa
e2707a016c qt5: upgrade to 5.12.3
* be aware that in 3 qt* project the v5.12.3 tag wasn't created yet:
  qtknx_git.bb:# v5.12.3 tag wasn't created yet
  qtmqtt_git.bb:# v5.12.3 tag wasn't created yet
  qtopcua_git.bb:# v5.12.3 tag wasn't created yet

* and qttools, qt3d, qtremoteobjects v5.12.3 tag isn't in 5.12 branch

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-04-18 23:04:41 +00:00
Mikko Gronoff
28d4bfdf74 Upgrade to 5.12.2
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
2019-04-03 14:10:43 +00:00
Martin Jansa
c8d5ef50d5 qt5: upgrade to latest revision in 5.12
* WIP
* zlib temporarily disabled in qtbase-native, the configure fails too
  find it even when it is in RSS:
docker-shr qemux86-64@ ~/build/oe-core $ find /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0 -name zlib\*
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/freetype/src/gzip/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib.pri
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib/src/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib_dependency.pri
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/lib/pkgconfig/zlib.pc
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/include/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/sysroot-providers/zlib-native
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.2dcdd26b684916aff89d13cb1c919939
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.complete

ERROR: Feature 'system-zlib' was enabled, but the pre-condition 'libs.zlib' failed.

* fixes #136

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-12-21 21:01:40 +00:00
Mikko Gronoff
0cdf727668 qt5: upgrade to 5.11.3
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
2018-12-20 00:55:36 +00:00
Martin Jansa
f9e80edff0 qt5: update to latest revision in 5.11 branch
* drop nobranch=1 again
* update the branches and tags on meta-qt5/qt* forks and the tag name
  in recipes
* use latest revision in 5.11 branch instead of 5.11.2 which might be
  removed again

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-09-25 09:34:49 +00:00
Samuli Piippo
3e7da25564 qt5: update to Qt 5.11.2
Update The-Qt-Company-Commercial license to the actual commercial
license which also replaces preview license in qtbase. Remove old
licenses that are no longer used in any module.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
2018-09-25 09:34:49 +00:00
Martin Jansa
ef5f5d912d qt5: upgrade to 5.11.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-06-22 14:35:29 +00:00
Samuli Piippo
e0a4e23c1d qt5: Update to Qt 5.11.0
Add recipes for Qt OPC UA and Qt WebGL platform plugin.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-05-30 20:02:46 +00:00
Martin Jansa
35f8981b11 qt5: upgrade to 5.11 beta3+
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-04-20 10:06:37 +00:00
Martin Jansa
f33be06035 qt5: upgrade to 5.11 Alpha
* use qtwebkit and qtwebkit-examples from dev branch, because there is
  no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in
  qt5-git.inc nobody noticed).
* qtbase: drop qml-debug options
  removed from qtbase in:
  commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1
  Author: Ulf Hermann <ulf.hermann@qt.io>
  Date:   Fri Oct 6 16:27:09 2017 +0200
  Subject: Remove qml-debug configure flag and feature
* qtgraphicaleffects, qtquickcontrols2, qtquickcontrols,
  qtvirtualkeyboard: add qtdeclarative-native dependency
  needed for qmlcachegen binary
* qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs
  referenced files disappered in:
  commit 6882a04fb36642862b11efe514251d32070c3d65
  Author: Konstantin Tokarev <annulen@yandex.ru>
  Date:   Thu Aug 25 19:20:41 2016 +0300
  Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-04-20 10:06:37 +00:00
Mikko Gronoff
e41caf42e9 Upgrade to Qt 5.10.1
Updated Qt modules to 5.10.1.
New recipe qtknx added.

Change-Id: I711c75253a9c0d9dcfbaac8867b35a4505d101ea
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-02-22 13:56:45 +00:00
Samuli Piippo
5ae76bbcf5 Upgrade to Qt 5.10.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-12-16 15:51:12 +00:00
Herman van Hazendonk
bbb3044569 meta-qt5: Update to 5.9.2 release
Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
2017-10-17 11:12:17 +00:00
Kwangsub Kim
2c3ef00f53 qt5: add missing commercial license
Signed-off-by: Kwangsub Kim <kwangsub.kim@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-10-02 12:05:14 +00:00
Martin Jansa
9c7507ef15 qt: upgrade to latest revision in 5.9 branch
* 3 patches were included upstream

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-08-22 17:33:38 +02:00
Samuli Piippo
969f1f80bf Upgrade to Qt 5.9.0
* adapt QtWebEngine recipe to use GN instead of GYP
* add QtRemoteObjects and QtWebView as a new Qt modules
* update available QtBase configure arguments
* remove obsolete patches
* patch all .pc files to remove build paths
* include generated QML cache files in packages
* the patch "configure paths for target qmake properly" could not
  be applied anymore and support must be done differently

* QtWebEngine now requires gcc-multilib to be installed on the host
  system, because the host tools are built to the same bitness as
  the target (arm -> x86, aarch64 -> x86-64)

* refresh the patches to match with b5.9* branches on:
  https://github.com/meta-qt5/qtbase
  https://github.com/meta-qt5/qtwebengine
  and 56-based branch on
  https://github.com/meta-qt5/qtwebengine-chromium

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-08-20 19:30:05 +02:00
Steffen Sledz
aa0605d3c7 qtquickcontrols2: fix compilation of examples/texteditor
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>
2017-07-12 10:25:31 +02:00
Samuli Piippo
333949a823 Upgrade to Qt 5.8
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>
2017-01-26 16:18:39 +01:00
Martin Jansa
1a42aa78af qt5: upgrade to latest revisions in 5.7 branch
* 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>
2016-08-05 11:03:12 +02:00
Martin Jansa
bf2cafa909 qt5: upgrade to latest revisions in 5.7 branches
* these revisions are after v5.7.0-beta1 tags where available
* it's highly recommended to read:
  http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
  to find out how you're affected check which files/tools are
  included in your builds, e.g. for qtwebengine:
  OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c
     11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$
     67 ** $QT_BEGIN_LICENSE:BSD$
     17 ** $QT_BEGIN_LICENSE:FDL$
     61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$
    261 ** $QT_BEGIN_LICENSE:LGPL$
* change in chromium's LICENSE is only copyright year update

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-02 15:16:18 +02:00
Samuli Piippo
c1b0c9f546 qt5: add one more subfolder for ${PN}-qmldesigner
QtQuickControls2 has deeper folder structure, make sure that files
go to correct packages.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-02 15:16:18 +02:00
Martin Jansa
754aaadc7f qt5: upgrade to latest revision in 5.6 branch
* qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
  and
  qtwebkit/0004-Fix-linking-with-libpthread.patch
  were resolved upstream
* all patches were refreshed with:
  git format-patch --no-numbered --no-signature -NUMBER
  to remove numbering from Subject (it's good enough in filename) and to
  remove git version from signature (so it doesn't look differently when
  generated on different hosts with different git version).

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-04-21 21:36:18 +02:00
Andreas Müller
072df2617a qtquickcontrols2: initial add 5.6.0
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-04-20 10:51:51 +02:00