Message ID | 1509667284-13771-1-git-send-email-joshua.henderson@microchip.com |
---|---|
State | Accepted |
Headers | show |
Series | [v5] qt5: remove Qt Quick dependency on opengl | expand |
Peter (Seiderer), Could you review/ack/test this Qt 5 related patch? Your opinion/feedback on Qt5 patches is always very valuable. Thanks! On Thu, 2 Nov 2017 17:01:24 -0700, Joshua Henderson wrote: > Qt Quick should no longer depend on opengl, and instead fallback to the limited > functionality software renderer as a replacement [1] when not available. This > also pulls in an upstream qt5declarative 5.10 patch [2], replacing an existing > one, to qt5 5.9.2 to fix no-opengl builds. > > [1] http://blog.qt.io/blog/2016/08/15/the-qt-quick-graphics-stack-in-qt-5-8/ > [2] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=fa52bb665d6b > > Cc: Peter Seiderer <ps.report@gmx.net> > Cc: Julien Corjon <corjon.j@ecagroup.com> > Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com> > Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> Thomas
Hello Joshua, On Thu, 2 Nov 2017 17:01:24 -0700, Joshua Henderson <joshua.henderson@microchip.com> wrote: > Qt Quick should no longer depend on opengl, and instead fallback to the limited > functionality software renderer as a replacement [1] when not available. This > also pulls in an upstream qt5declarative 5.10 patch [2], replacing an existing > one, to qt5 5.9.2 to fix no-opengl builds. > > [1] http://blog.qt.io/blog/2016/08/15/the-qt-quick-graphics-stack-in-qt-5-8/ > [2] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=fa52bb665d6b > > Cc: Peter Seiderer <ps.report@gmx.net> > Cc: Julien Corjon <corjon.j@ecagroup.com> > Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com> > Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> > > --- > > v5: > - Add missing signed-off-by and status to backported patch. > > v4: > - Don't backport upstream patch to 5.6.3, and instead note in existing patch why. > > v3: > - Prefer upstream patch for qt5declarative for 5.9.2 and 5.6.3 > > v2: > - remove opengl dependency on qt5virtualkeyboard > - move qt5declarative patch from 5.9.1 to 5.9.2 > --- > ...uickviewcomparison-and-quickwidget-needs-.patch | 6 +++++ > .../5.9.2/0001-Fix-no-opengl-builds.patch | 31 ++++++++++++++++++++++ > package/qt5/qt5declarative/Config.in | 6 ++--- > package/qt5/qt5multimedia/qt5multimedia.mk | 3 ++- > package/qt5/qt5quickcontrols/Config.in | 4 +-- > package/qt5/qt5quickcontrols2/Config.in | 4 +-- > package/qt5/qt5virtualkeyboard/Config.in | 4 +-- > 7 files changed, 48 insertions(+), 10 deletions(-) > create mode 100644 package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch > > diff --git a/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch b/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch > index 875634f..7959d38 100644 > --- a/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch > +++ b/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch > @@ -34,6 +34,12 @@ Fixes: > > Signed-off-by: Peter Seiderer <ps.report@gmx.net> > --- > + > +Note: > +An equivalent patch is upstream for qt5declarative 5.10, but it is not suitable for > +backporting to this version due to license differences. > + > +--- > examples/quick/quick.pro | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch b/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch > new file mode 100644 > index 0000000..82b6231 > --- /dev/null > +++ b/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch > @@ -0,0 +1,31 @@ > +From fa52bb665d6beb77a951c14c8edcba3541850afc Mon Sep 17 00:00:00 2001 > +From: Allan Sandfeld Jensen <allan.jensen@qt.io> > +Date: Mon, 25 Sep 2017 16:53:24 +0200 > +Subject: [PATCH] Fix no-opengl builds > + > +The qquickwidgets examples uses OpenGL directly > + > +Change-Id: I1cc8cfbcf249abc98473287a9d499032232828c7 > +Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> > +Upstream-Status: Backport > +Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com> > +--- > + examples/quick/quick.pro | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro > +index 445dfb0..7da255e 100644 > +--- a/examples/quick/quick.pro > ++++ b/examples/quick/quick.pro > +@@ -36,7 +36,7 @@ qtConfig(opengl(es1|es2)?) { > + # Widget dependent examples > + qtHaveModule(widgets) { > + SUBDIRS += embeddedinwidgets > +- qtHaveModule(quickwidgets): SUBDIRS += quickwidgets > ++ qtHaveModule(quickwidgets):qtConfig(opengl(es1|es2)?): SUBDIRS += quickwidgets > + } > + > + EXAMPLE_FILES = \ > +-- > +2.7.4 > + > diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in > index 5384b5f..3a353a8 100644 > --- a/package/qt5/qt5declarative/Config.in > +++ b/package/qt5/qt5declarative/Config.in > @@ -17,11 +17,11 @@ config BR2_PACKAGE_QT5DECLARATIVE > if BR2_PACKAGE_QT5DECLARATIVE > > comment "quick module needs an OpenGL-capable backend" > - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE > + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST > > config BR2_PACKAGE_QT5DECLARATIVE_QUICK > bool "quick module" > - depends on BR2_PACKAGE_QT5_GL_AVAILABLE > - select BR2_PACKAGE_QT5BASE_OPENGL > + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST > + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE > > endif > diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk > index 835142e..6df96bc 100644 > --- a/package/qt5/qt5multimedia/qt5multimedia.mk > +++ b/package/qt5/qt5multimedia/qt5multimedia.mk > @@ -61,7 +61,8 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS > endef > endif > > -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) > +# this is only built with quick/opengl support enabled > +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_GL_AVAILABLE),yy) > define QT5MULTIMEDIA_INSTALL_TARGET_QMLS > cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/ > endef > diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in > index 3cc5821..59f6ca4 100644 > --- a/package/qt5/qt5quickcontrols/Config.in > +++ b/package/qt5/qt5quickcontrols/Config.in > @@ -1,6 +1,6 @@ > config BR2_PACKAGE_QT5QUICKCONTROLS > bool "qt5quickcontrols" > - depends on BR2_PACKAGE_QT5_GL_AVAILABLE > + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST > depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE > select BR2_PACKAGE_QT5DECLARATIVE > select BR2_PACKAGE_QT5DECLARATIVE_QUICK > @@ -14,5 +14,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS > http://doc.qt.io/qt-5/qtquickcontrols-index.html > > comment "qt5quickcontrols needs an OpenGL-capable backend" > - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE > + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST > depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE > diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in > index 1066b17..d036f74 100644 > --- a/package/qt5/qt5quickcontrols2/Config.in > +++ b/package/qt5/qt5quickcontrols2/Config.in > @@ -1,6 +1,6 @@ > config BR2_PACKAGE_QT5QUICKCONTROLS2 > bool "qt5quickcontrols2" > - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick > + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick > depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick > select BR2_PACKAGE_QT5DECLARATIVE > select BR2_PACKAGE_QT5DECLARATIVE_QUICK > @@ -16,5 +16,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 > https://doc.qt.io/qt-5/qtquickcontrols2-index.html > > comment "qt5quickcontrols2 needs an OpenGL-capable backend" > - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE > + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST > depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE > diff --git a/package/qt5/qt5virtualkeyboard/Config.in b/package/qt5/qt5virtualkeyboard/Config.in > index a685815..f0e4f03 100644 > --- a/package/qt5/qt5virtualkeyboard/Config.in > +++ b/package/qt5/qt5virtualkeyboard/Config.in > @@ -1,13 +1,13 @@ > comment "qt5virtualkeyboard needs at least qt-5.7 and an OpenGL backend" > depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE > - depends on !BR2_PACKAGE_QT5_VERSION_LATEST || !BR2_PACKAGE_QT5_GL_AVAILABLE > + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST > > config BR2_PACKAGE_QT5VIRTUALKEYBOARD > bool "qt5virtualkeyboard" > # needs at least Qt 5.7 > depends on BR2_PACKAGE_QT5_VERSION_LATEST > depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative > - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative quick > + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick > select BR2_PACKAGE_QT5DECLARATIVE > select BR2_PACKAGE_QT5DECLARATIVE_QUICK > select BR2_PACKAGE_QT5SVG Tested-by: Peter Seiderer <ps.report@gmx.net> Tested on current buildroot git master, compiled for the Rpi3 and runtime tested e.g. by running: $ /usr/lib/qt/examples/quick/keyinteraction/keyinteraction $ /usr/lib/qt/examples/virtualkeyboard/basic/basic Notes: - the patch package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch is already committed to bulildroot with 5e7ddc54dfcad1bda4c093c110c5ce2c4bbeffd4 - the following patch was needed for the qtquickcontrols2 example compile diff --git a/examples/quickcontrols2/quickcontrols2.pro b/examples/quickcontrols2/quickcontrols2.pro index 858759fb..8310e9b2 100644 --- a/examples/quickcontrols2/quickcontrols2.pro +++ b/examples/quickcontrols2/quickcontrols2.pro @@ -6,5 +6,6 @@ SUBDIRS += \ contactlist \ sidepanel \ swipetoremove \ - flatstyle \ wearable + +qtHaveModule(widgets): SUBDIRS += flatstyle - Used defconfig: BR2_arm=y BR2_cortex_a53=y BR2_ARM_FPU_NEON_VFPV4=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay --gpu_mem_1024=200" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7dc3bd00d62130ef7f09759a8c0ec9d65f58c987" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-cm3" BR2_PACKAGE_LIBERATION=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_EXAMPLES=y BR2_PACKAGE_QT5BASE_DEFAULT_QPA="linuxfb" BR2_PACKAGE_QT5BASE_FONTCONFIG=y BR2_PACKAGE_QT5BASE_HARFBUZZ=y BR2_PACKAGE_QT5BASE_GIF=y BR2_PACKAGE_QT5BASE_JPEG=y BR2_PACKAGE_QT5BASE_PNG=y BR2_PACKAGE_QT5MULTIMEDIA=y BR2_PACKAGE_QT5QUICKCONTROLS=y BR2_PACKAGE_QT5QUICKCONTROLS2=y BR2_PACKAGE_QT5VIRTUALKEYBOARD=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="360M" # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y Regards, Peter
Hello, On Thu, 2 Nov 2017 17:01:24 -0700, Joshua Henderson wrote: > Qt Quick should no longer depend on opengl, and instead fallback to the limited > functionality software renderer as a replacement [1] when not available. This > also pulls in an upstream qt5declarative 5.10 patch [2], replacing an existing > one, to qt5 5.9.2 to fix no-opengl builds. > > [1] http://blog.qt.io/blog/2016/08/15/the-qt-quick-graphics-stack-in-qt-5-8/ > [2] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=fa52bb665d6b > > Cc: Peter Seiderer <ps.report@gmx.net> > Cc: Julien Corjon <corjon.j@ecagroup.com> > Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com> > Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> > > --- I've applied to master, after dropping package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch because Peter has bumped Qt to 5.9.3 since then, and qt5declarative 5.9.3 already includes this fix for non-OpenGL builds. Thanks! Thomas
diff --git a/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch b/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch index 875634f..7959d38 100644 --- a/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch +++ b/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch @@ -34,6 +34,12 @@ Fixes: Signed-off-by: Peter Seiderer <ps.report@gmx.net> --- + +Note: +An equivalent patch is upstream for qt5declarative 5.10, but it is not suitable for +backporting to this version due to license differences. + +--- examples/quick/quick.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch b/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch new file mode 100644 index 0000000..82b6231 --- /dev/null +++ b/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch @@ -0,0 +1,31 @@ +From fa52bb665d6beb77a951c14c8edcba3541850afc Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@qt.io> +Date: Mon, 25 Sep 2017 16:53:24 +0200 +Subject: [PATCH] Fix no-opengl builds + +The qquickwidgets examples uses OpenGL directly + +Change-Id: I1cc8cfbcf249abc98473287a9d499032232828c7 +Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> +Upstream-Status: Backport +Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com> +--- + examples/quick/quick.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro +index 445dfb0..7da255e 100644 +--- a/examples/quick/quick.pro ++++ b/examples/quick/quick.pro +@@ -36,7 +36,7 @@ qtConfig(opengl(es1|es2)?) { + # Widget dependent examples + qtHaveModule(widgets) { + SUBDIRS += embeddedinwidgets +- qtHaveModule(quickwidgets): SUBDIRS += quickwidgets ++ qtHaveModule(quickwidgets):qtConfig(opengl(es1|es2)?): SUBDIRS += quickwidgets + } + + EXAMPLE_FILES = \ +-- +2.7.4 + diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index 5384b5f..3a353a8 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -17,11 +17,11 @@ config BR2_PACKAGE_QT5DECLARATIVE if BR2_PACKAGE_QT5DECLARATIVE comment "quick module needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST config BR2_PACKAGE_QT5DECLARATIVE_QUICK bool "quick module" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - select BR2_PACKAGE_QT5BASE_OPENGL + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE endif diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 835142e..6df96bc 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -61,7 +61,8 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS endef endif -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) +# this is only built with quick/opengl support enabled +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_GL_AVAILABLE),yy) define QT5MULTIMEDIA_INSTALL_TARGET_QMLS cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/ endef diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in index 3cc5821..59f6ca4 100644 --- a/package/qt5/qt5quickcontrols/Config.in +++ b/package/qt5/qt5quickcontrols/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS bool "qt5quickcontrols" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK @@ -14,5 +14,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS http://doc.qt.io/qt-5/qtquickcontrols-index.html comment "qt5quickcontrols needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in index 1066b17..d036f74 100644 --- a/package/qt5/qt5quickcontrols2/Config.in +++ b/package/qt5/qt5quickcontrols2/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 bool "qt5quickcontrols2" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK @@ -16,5 +16,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 https://doc.qt.io/qt-5/qtquickcontrols2-index.html comment "qt5quickcontrols2 needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5virtualkeyboard/Config.in b/package/qt5/qt5virtualkeyboard/Config.in index a685815..f0e4f03 100644 --- a/package/qt5/qt5virtualkeyboard/Config.in +++ b/package/qt5/qt5virtualkeyboard/Config.in @@ -1,13 +1,13 @@ comment "qt5virtualkeyboard needs at least qt-5.7 and an OpenGL backend" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_PACKAGE_QT5_VERSION_LATEST || !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST config BR2_PACKAGE_QT5VIRTUALKEYBOARD bool "qt5virtualkeyboard" # needs at least Qt 5.7 depends on BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative quick + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK select BR2_PACKAGE_QT5SVG