aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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-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>
* 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>
* qtserialbus: add recipeJonathan Liu2016-07-271-0/+13
| | | | | | | Qt Serial Bus module was added in Qt 5.7. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwayland: Rework recipe to allow PACKAGECONFIG useOtavio Salvador2016-07-221-10/+19
| | | | | | | | | | | | | | | | | | | The Qt Wayland uses some modules which can be enabled/disabled depending on users needs, however this must be deterministic. So we now use PACKAGECONFIG to enable/disable those features. Following options are available: - brcm-egl - compositor-api - drm-egl - glx - libhybris-egl - wayland-egl - xcompositor - xkb Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Tom Hochstein <tom.hochstein@nxp.com>
* qtwayland: add dependency on libxcompositeMartin Jansa2016-06-131-1/+1
| | | | | | | * fixes QA: qtwayland-5.6.99+5.7.0-beta+gitAUTOINC+d27075a3f9: qtwayland-plugins rdepends on libxcomposite, but it isn't a build dependency, missing libxcomposite in DEPENDS or PACKAGECONFIG? [build-deps] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtcharts: Add dependency on qtmultimediaMartin Jansa2016-06-131-1/+1
| | | | | | | * fixes QA: qtcharts-5.6.99+5.7.0-beta+gitAUTOINC+8a78184181: qtcharts-examples rdepends on qtmultimedia, but it isn't a build dependency, missing qtmultimedia in DEPENDS or PACKAGECONFIG? [build-deps] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* packagegroup-qt5-toolchain-target.bb: Add qtdeclarative-tools to RDEPENDS.Ann Thornton2016-06-091-0/+1
| | | | | Signed-off-by: Ann Thornton <ann.thornton@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* qtchooser: add new recipeLi xin2016-05-182-0/+65
| | | | | | | qtchooser is a wrapper used to select between Qt binary versions. Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtvirtualkeyboard: add recipeJonathan Liu2016-05-181-0/+11
| | | | | | | Qt Virtual Keyboard module was added in Qt 5.7. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtdeclarative-render2d: add recipeJonathan Liu2016-05-181-0/+12
| | | | | | | Qt Quick 2D Renderer module was added in Qt 5.7. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtdatavis3d: add recipeJonathan Liu2016-05-181-0/+11
| | | | | | | Qt Data Visualization module was added in Qt 5.7. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtcharts: add recipeJonathan Liu2016-05-181-0/+11
| | | | | | | Qt Charts module was added in Qt 5.7. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* licenses: update technology preview license to match upstreamJonathan Liu2016-05-181-3/+0
| | | | | | | | The license has extra blank lines at the end so these are removed to match LICENSE.PREVIEW.COMMERCIAL from upstream. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* cmake_qt5: prepend the Qt5 specific CMake variables to EXTRA_OECMAKEPascal Bach2016-05-181-1/+1
| | | | | | | | | | | | Using the prepend function instead of "=+" makes sure the variables are set even if the user overrides EXTRA_OECMAKE with "=" instead of just appending to it. Prepending also allows overriding because later arguments take precedence ever earlier ones in CMake. Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add patch to make Qt5Config modules behave better with cmake buildsPascal Bach2016-05-182-0/+68
| | | | | | | | | | | | | | | | | | | 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>
* qt5: Allow disabling SHA validation for branchSamuli Piippo2016-05-091-1/+2
| | | | | | | | | | | | | Qt releases are done from a release branch (5.x.x), which is later merged back to a stable branch (5.x) and then removed. When a recipe is updated to use the released SHA from the release branch, it will eventually break when the release branch is removed. This happens because bitbake tries to validate that given SHA is found from the given branch. Add additional variable that can be used to disable the SHA check when branch is known to be later removed, but SHA remains valid. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Reorder EGL libraries from pkgconfig and defaults:Julien Gueytat2016-05-092-0/+99
| | | | | | | | | | | | | | | https://bugreports.qt.io/browse/QTBUG-50838 https://bugreports.qt.io/browse/QTBUG-52739 The modification is the less intrusive possible. It only swaps LIBS and QMAKE_LIBS_EGL. The reason behind that was that for the RaspberryPi: * -lEGL -GLESv2 can link * -lGLESv2 -lEGL can't Adding -lEGL -lGLESv2 and then -lEGL gives -lGLESv2 -lEGL ... the libraries swaped. Signed-off-by: Julien Gueytat <contact@jgueytat.fr> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: add PACKAGECONFIGs for libxcomposite, libxrender, fontconfigMartin Jansa2016-05-061-1/+13
| | | | | | | * fixes following QA: WARNING: qtwebkit-5.6.99+5.7.0-alpha+gitAUTOINC+e9b369b16f-r0 do_package_qa: QA Issue: qtwebkit rdepends on libxcomposite, but it isn't a build dependency? [build-deps] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: remove fonts packagesMartin Jansa2016-05-022-41/+0
| | | | | | | | | | | * fonts were removed from qtbase in: commit c5ceabb9a1caf6b9b7615a28c3097f221772f645 Author: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Date: Mon Aug 17 18:32:41 2015 +0200 Purge all fonts Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Remove unsupported options xvideo, xinerama, xinput, gtkstyleMartin Jansa2016-05-021-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * xvideo and xinerama were removed in: commit e824abd987d77efaa085fe1f9fb514d270798d55 Author: Alexander Volkov <a.volkov@rusbitech.ru> Date: Tue Oct 13 18:43:25 2015 +0300 configure: Remove unused options -xvideo and -xinerama -xvideo was not used even by Qt 4 for a long time. -xinerama was used by the xlib plugin which was dropped by e6a7a6a381c0b61a93a642b425ecbcd714fd1c29. * xinput was removed in: commit fa8dbbff8895e7e1fdf1e6b0a9f3d821cd2caf2f Author: Alexander Volkov <a.volkov@rusbitech.ru> Date: Thu Oct 8 18:19:39 2015 +0300 configure: Remove -xinput option It's obsolete since e6a7a6a381c0b61a93a642b425ecbcd714fd1c29 (Remove xlib plugin) and a2337f79ffd229aa1e91f6bfec6294570eb3fe44 (Remove Windows and X11 from src/widgets/platforms). The actual option is -xinput2. * gtkstyle was removed (partially replaced with gtk) in: commit 899a815414e95da8d9429a4a4f4d7094e49cfc55 Author: Dmitry Shachnev <mitya57@gmail.com> Date: Thu Jul 30 21:32:43 2015 +0300 Remove gtk2 style from qtbase, it will be moved to qtstyleplugins This will allow us to drop gtk2 support from qtbase in future, while still providing the gtk2 style for those who want to use it. Also with moving to qtstyleplugins, the code can be simplified because we can directly link to libraries we need, instead of using QLibrary. [ChangeLog][QtWidgets] Remove QGtkStyle, it is now provided in qtstyleplugins repository. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revisions in 5.7 branchesMartin Jansa2016-05-0266-237/+938
| | | | | | | | | | | | | | | | | * 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>
* qt5: add one more subfolder for ${PN}-qmldesignerSamuli Piippo2016-05-022-2/+1
| | | | | | | | 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>
* replace base_contains by bb.utils.containsAndreas Müller2016-05-029-34/+34
| | | | | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.6 branchMartin Jansa2016-04-2162-268/+108
| | | | | | | | | | | | | | * 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>
* qt5: set SRCREVs,PVs to 5.6.0Andreas Müller2016-04-2030-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * qtquick1: LICENSE.LGPLv3: I checked git repository. To be honest: I have no idea what caused checksum change. JaMa: it was modified in this change: OE @ ~/projects/qt-project/qtquick1 $ git log --oneline 87f2415adf34da08e6cd58f5da6f6a7d0d9cf141..dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295 -- LICENSE.LGPLv3 cd50897 Add the GPLv3 license text diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index 8fbb743..4d67bac 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -5,6 +5,8 @@ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU Lesser General Public License version 3, which is displayed below. + This license makes reference to the version 3 of the GNU General + Public License, which you can find in the LICENSE.GPLv3 file. * in some cases this is actually older SRCREV than what was used before (because normally the recipes use latest revision in stable - e.g. 5.6 branches, not the actuall tags). I'll upgrade to latest 5.6 revisions in follow-up commit (together with refreshing the .patch files and github.com/meta-qt5/qt* repositories to apply cleanly) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtquickcontrols: fix compilation of examples/texteditorDenys Dmytriyenko2016-04-202-0/+31
| | | | | | | | git/examples/quick/controls/texteditor/src/documenthandler.cpp:136:12: error: invalid use of incomplete type 'class QDebug' qDebug() << "saved to" << localPath; Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtdeclarative: fix compilation of examples/qquickviewcomparisonDenys Dmytriyenko2016-04-202-0/+29
| | | | | | | | git/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp:180:14: error: 'QCoreApplication' has not been declared if (!QCoreApplication::arguments().contains(QStringLiteral("--no_render_alpha"))) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* quazip: update to 0.7.2Jonathan Liu2016-04-201-2/+2
| | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtquickcontrols2: initial add 5.6.0Andreas Müller2016-04-201-0/+15
| | | | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
* qmake5_base: use remove-libtool bbclassMartin Jansa2016-04-201-3/+1
| | | | | | | | | * this requires latest oe-core (Yocto 2.1), if you want to use latest meta-qt5 with older oe-core, you need to backport this bbclass and more importantly don't forget to provide EXTRA_CONF_PACKAGECONFIG Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONFMartin Jansa2016-04-208-12/+12
| | | | | | | | | | | | * this fixes builds for DISTROs which include no-static-libraries.inc * this change depends on oe-core change: http://patchwork.openembedded.org/patch/116719/ which was merged in this form: http://patchwork.openembedded.org/patch/120513/ to Yocto 2.1, if you want to use latest meta-qt5 with older oe-core you need to append EXTRA_OECONF to PACKAGECONFIG_CONFARGS Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: enable ARMv7VE supportJonathan Liu2016-03-071-0/+1
| | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Add .gitignore to ignore .pyc/.pyo filesPaul Eggleton2016-03-071-0/+2
| | | | | | | | | Since we just added lib/ containing python modules, we should really ignore any compiled python objects since they will be produced if the code is executed. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* gdb: include readline in default PACKAGECONFIGMartin Jansa2016-03-021-1/+1
| | | | | | | * without readline in PACKAGECONFIG and with no-static-libraries.inc gdb fails when trying to build against own bundled static readline Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* libconnman-qt5: update to 1.0.98Jonathan Liu2016-02-271-2/+2
| | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: backport patch to fix linking with qtwebkitJonathan Liu2016-02-272-0/+34
| | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* libconnman-qt5: remove blacklistJonathan Liu2016-02-271-2/+0
| | | | | | | | The package no longer fails sanity test because of connman-qt5.pc containing references to build host paths. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix up pkgconfig replacementsJonathan Liu2016-02-271-29/+27
| | | | | | | | | | | | | | The replacements were being done in qt_module.prf which is not included when building 3rd party libraries. To resolve this, move the replacements from qt_module.prf to qt.prf which is included when building any qmake project. The pkgconfig include replacement is removed as it doesn't seem to be needed anymore and causes issues when the includedir path in pkgconfig has part of its path replaced with ${includedir} resulting in a circular reference that causes the OE package_do_pkgconfig task to fail. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add runtime dependency to xkeyboard-configSamuli Piippo2016-02-251-1/+1
| | | | | | | | When qtbase is configured with xkbcommon-evdev (usually without X), make sure xkeyboard-config is installed to provide keymap database. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipetool: add support for Qt5 to meta-qt5Paul Eggleton2016-02-252-0/+165
| | | | | | | | | | | | Having in recent OE-Core master added build system extension capabilities to recipetool, add a module in meta-qt5 which uses this to enable extraction of Qt5 dependencies from cmake, qmake and autoconf files. It's by no means perfect but does do something useful if you add a recipe for a Qt5-using piece of software using recipetool create or devtool add. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* libconnman-qt5: Blacklist because of connman-qt5.pcMartin Jansa2016-02-241-0/+2
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: skip libdir for ${PN}-dbg and dev-elf for ${PN}-examples-devMartin Jansa2016-02-201-1/+2
| | | | | | * the examples are installed in locations, QA checks don't like Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: upgrade SRCREVs a bit moreMartin Jansa2016-02-2013-20/+20
| | | | | | * to make sure that qtbase modules report 4.6.1 version Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* nativesdk-qtbase: use runtime linked dbusSamuli Piippo2016-02-201-1/+2
| | | | | | | | Remove direct dependency to nativesdk-dbus. Instead configure qtbase to use runtime linked dbus library, if that is found. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>