From 0b15027d24c2bbf1b723d9d684a61c5d025919b3 Mon Sep 17 00:00:00 2001 From: Wojciech Slenska Date: Mon, 5 May 2014 19:06:46 +0200 Subject: [PATCH] qt5quick1: removed OpenGL dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Qt5Quick1 module doesn't need OpenGL libs and declarative module. This module can be used to port qt4 qml apps to qt5. Patch has been tested with linuxfb output plugin. Signed-off-by: Wojciech Slenska Reviewed-by: Fatih Aşıcı Signed-off-by: Peter Korsgaard --- package/qt5/qt5quick1/Config.in | 8 ++------ package/qt5/qt5quick1/qt5quick1.mk | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in index 30c2e79182..59b6c347be 100644 --- a/package/qt5/qt5quick1/Config.in +++ b/package/qt5/qt5quick1/Config.in @@ -5,11 +5,8 @@ config BR2_PACKAGE_QT5QUICK1 select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5SCRIPT select BR2_PACKAGE_QT5XMLPATTERNS - select BR2_PACKAGE_QT5DECLARATIVE # This module does not support static linking depends on !BR2_PREFER_STATIC_LIB - depends on BR2_PACKAGE_HAS_LIBEGL - depends on BR2_PACKAGE_HAS_LIBGLES depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE help Qt is a cross-platform application and UI framework for @@ -19,7 +16,6 @@ config BR2_PACKAGE_QT5QUICK1 http://qt-project.org -comment "qt5quick1 needs a toolchain w/ dynamic library and an OpenGL-capable backend" +comment "qt5quick1 needs a toolchain w/ dynamic library" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES || \ - BR2_PREFER_STATIC_LIB + depends on BR2_PREFER_STATIC_LIB diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk index 624b130775..e9d7a64ae6 100644 --- a/package/qt5/qt5quick1/qt5quick1.mk +++ b/package/qt5/qt5quick1/qt5quick1.mk @@ -7,7 +7,7 @@ QT5QUICK1_VERSION = $(QT5_VERSION) QT5QUICK1_SITE = $(QT5_SITE) QT5QUICK1_SOURCE = qtquick1-opensource-src-$(QT5QUICK1_VERSION).tar.xz -QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative \ +QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script \ $(if $(BR2_PACKAGE_QT5WEBKIT),qt5webkit) QT5QUICK1_INSTALL_STAGING = YES -- 2.30.2