* [Buildroot] [PATCH 1/6] qt5multimedia: make qt5declarative dependency optional
2014-07-19 17:33 [Buildroot] [PATCH 0/6] qt5: dependency fixes Fatih Aşıcı
@ 2014-07-19 17:33 ` Fatih Aşıcı
2014-07-20 10:02 ` Thomas Petazzoni
2014-07-19 17:33 ` [Buildroot] [PATCH 2/6] qt5base: allow selection of OpenGL API Fatih Aşıcı
` (5 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Fatih Aşıcı @ 2014-07-19 17:33 UTC (permalink / raw)
To: buildroot
Also add missing dependencies on gui and network modules.
Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
---
package/qt5/qt5multimedia/Config.in | 10 ++--------
package/qt5/qt5multimedia/qt5multimedia.mk | 6 +++++-
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in
index c00491c..36128eb 100644
--- a/package/qt5/qt5multimedia/Config.in
+++ b/package/qt5/qt5multimedia/Config.in
@@ -1,10 +1,8 @@
config BR2_PACKAGE_QT5MULTIMEDIA
bool "qt5multimedia"
select BR2_PACKAGE_QT5BASE
- select BR2_PACKAGE_QT5DECLARATIVE
- depends on BR2_PACKAGE_HAS_LIBEGL
- depends on BR2_PACKAGE_HAS_LIBGLES
- depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+ select BR2_PACKAGE_QT5BASE_GUI
+ select BR2_PACKAGE_QT5BASE_NETWORK
help
Qt is a cross-platform application and UI framework for
developers using C++.
@@ -12,7 +10,3 @@ config BR2_PACKAGE_QT5MULTIMEDIA
This package corresponds to the qt5multimedia module.
http://qt-project.org
-
-comment "qt5multimedia requires an OpenGL-capable backend"
- depends on (!BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES) && \
- BR2_PACKAGE_QT5_JSCORE_AVAILABLE
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 5eef543..e89e31c 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -7,7 +7,7 @@
QT5MULTIMEDIA_VERSION = $(QT5_VERSION)
QT5MULTIMEDIA_SITE = $(QT5_SITE)
QT5MULTIMEDIA_SOURCE = qtmultimedia-opensource-src-$(QT5MULTIMEDIA_VERSION).tar.xz
-QT5MULTIMEDIA_DEPENDENCIES = qt5base qt5declarative
+QT5MULTIMEDIA_DEPENDENCIES = qt5base
QT5MULTIMEDIA_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
@@ -22,6 +22,10 @@ ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y)
QT5MULTIMEDIA_DEPENDENCIES += gst-plugins-base
endif
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
+QT5MULTIMEDIA_DEPENDENCIES += qt5declarative
+endif
+
define QT5MULTIMEDIA_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
endef
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 1/6] qt5multimedia: make qt5declarative dependency optional
2014-07-19 17:33 ` [Buildroot] [PATCH 1/6] qt5multimedia: make qt5declarative dependency optional Fatih Aşıcı
@ 2014-07-20 10:02 ` Thomas Petazzoni
2014-07-20 11:20 ` Fatih Aşıcı
0 siblings, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2014-07-20 10:02 UTC (permalink / raw)
To: buildroot
Dear Fatih A??c?,
On Sat, 19 Jul 2014 20:33:23 +0300, Fatih A??c? wrote:
> Also add missing dependencies on gui and network modules.
>
> Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
> ---
> package/qt5/qt5multimedia/Config.in | 10 ++--------
> package/qt5/qt5multimedia/qt5multimedia.mk | 6 +++++-
> 2 files changed, 7 insertions(+), 9 deletions(-)
Applied, thanks. However, please do not send your patches to both
buildroot at uclibc.org and buildroot at buildroot.org: they are the same
mailing list, so your patches appear twice on the list.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 1/6] qt5multimedia: make qt5declarative dependency optional
2014-07-20 10:02 ` Thomas Petazzoni
@ 2014-07-20 11:20 ` Fatih Aşıcı
0 siblings, 0 replies; 13+ messages in thread
From: Fatih Aşıcı @ 2014-07-20 11:20 UTC (permalink / raw)
To: buildroot
On Sunday 20 July 2014 12:02:34 Thomas Petazzoni wrote:
> Dear Fatih A??c?,
>
> On Sat, 19 Jul 2014 20:33:23 +0300, Fatih A??c? wrote:
> > Also add missing dependencies on gui and network modules.
> >
> > Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
> > ---
> >
> > package/qt5/qt5multimedia/Config.in | 10 ++--------
> > package/qt5/qt5multimedia/qt5multimedia.mk | 6 +++++-
> > 2 files changed, 7 insertions(+), 9 deletions(-)
>
> Applied, thanks. However, please do not send your patches to both
> buildroot at uclibc.org and buildroot at buildroot.org: they are the same
> mailing list, so your patches appear twice on the list.
Sorry. I passed one mail address from the command line; but I have realized that
.git/config file also has another address. I had added the latter for convenience
but forgot it.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140720/97856241/attachment.html>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 2/6] qt5base: allow selection of OpenGL API
2014-07-19 17:33 [Buildroot] [PATCH 0/6] qt5: dependency fixes Fatih Aşıcı
2014-07-19 17:33 ` [Buildroot] [PATCH 1/6] qt5multimedia: make qt5declarative dependency optional Fatih Aşıcı
@ 2014-07-19 17:33 ` Fatih Aşıcı
2014-07-20 10:02 ` Thomas Petazzoni
2014-07-19 17:33 ` [Buildroot] [PATCH 3/6] qt5declarative: add an option for quick module Fatih Aşıcı
` (4 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Fatih Aşıcı @ 2014-07-19 17:33 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
---
package/qt5/Config.in | 5 +++++
package/qt5/qt5base/Config.in | 46 +++++++++++++++++++++++++++++++++++++++---
package/qt5/qt5base/qt5base.mk | 18 +++++++++++++----
3 files changed, 62 insertions(+), 7 deletions(-)
diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 1f6920a..83f02f1 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -1,3 +1,8 @@
+config BR2_PACKAGE_QT5_GL_AVAILABLE
+ bool
+ depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES
+ default y
+
config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
bool
# Javascript engine is only available on certain architectures
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 490ee3e..fe742f3 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -116,6 +116,45 @@ config BR2_PACKAGE_QT5BASE_WIDGETS
help
This option enables the Qt5Widgets library.
+comment "OpenGL support needs an OpenGL-capable backend"
+ depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
+
+config BR2_PACKAGE_QT5BASE_OPENGL
+ bool "OpenGL support"
+ depends on BR2_PACKAGE_QT5_GL_AVAILABLE
+ help
+ This option enables OpenGL support.
+
+if BR2_PACKAGE_QT5BASE_OPENGL
+
+choice
+ prompt "OpenGL API"
+ help
+ Select OpenGL API.
+
+config BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP
+ bool "Desktop OpenGL"
+ depends on BR2_PACKAGE_HAS_LIBGL
+ help
+ Use desktop OpenGL.
+
+config BR2_PACKAGE_QT5BASE_OPENGL_ES2
+ bool "OpenGL ES 2.0+"
+ depends on BR2_PACKAGE_HAS_LIBGLES
+ help
+ Use OpenGL ES 2.0 and later versions.
+
+endchoice
+
+config BR2_PACKAGE_QT5BASE_OPENGL_LIB
+ bool "opengl module"
+ select BR2_PACKAGE_QT5BASE_WIDGETS
+ help
+ This option enables the Qt5OpenGL library. This library includes
+ OpenGL support classes provided to ease porting from Qt 4.x.
+
+endif
+
config BR2_PACKAGE_QT5BASE_LINUXFB
bool "linuxfb support"
@@ -138,11 +177,12 @@ comment "X.org XCB backend available if X.org is enabled"
config BR2_PACKAGE_QT5BASE_EGLFS
bool "eglfs support"
+ select BR2_PACKAGE_QT5BASE_OPENGL
depends on BR2_PACKAGE_HAS_LIBEGL
- depends on BR2_PACKAGE_HAS_LIBGLES
+ depends on BR2_PACKAGE_QT5_GL_AVAILABLE
-comment "eglfs backend available if OpenGLES and EGL are enabled"
- depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES
+comment "eglfs backend available if OpenGL and EGL are enabled"
+ depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_QT5_GL_AVAILABLE
config BR2_PACKAGE_QT5BASE_DEFAULT_QPA
string "Default graphical platform"
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index fecde13..712208f 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -96,12 +96,22 @@ else
QT5BASE_CONFIGURE_OPTS += -no-xcb
endif
+ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),y)
+QT5BASE_CONFIGURE_OPTS += -opengl desktop
+QT5BASE_DEPENDENCIES += libgl
+else ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL_ES2),y)
+QT5BASE_CONFIGURE_OPTS += -opengl es2
+QT5BASE_DEPENDENCIES += libgles
+else
+QT5BASE_CONFIGURE_OPTS += -no-opengl
+endif
+
QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA))
QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA))
ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y)
-QT5BASE_CONFIGURE_OPTS += -opengl es2 -eglfs
-QT5BASE_DEPENDENCIES += libgles libegl
+QT5BASE_CONFIGURE_OPTS += -eglfs
+QT5BASE_DEPENDENCIES += libegl
ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y)
QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \
$(@D)/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
@@ -111,7 +121,7 @@ QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \
$(@D)/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
endif
else
-QT5BASE_CONFIGURE_OPTS += -no-opengl -no-eglfs
+QT5BASE_CONFIGURE_OPTS += -no-eglfs
endif
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
@@ -146,7 +156,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_CONCURRENT) += Qt5Concurrent
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5OpenGL
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 2/6] qt5base: allow selection of OpenGL API
2014-07-19 17:33 ` [Buildroot] [PATCH 2/6] qt5base: allow selection of OpenGL API Fatih Aşıcı
@ 2014-07-20 10:02 ` Thomas Petazzoni
0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2014-07-20 10:02 UTC (permalink / raw)
To: buildroot
Dear Fatih A??c?,
On Sat, 19 Jul 2014 20:33:24 +0300, Fatih A??c? wrote:
> Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
> ---
> package/qt5/Config.in | 5 +++++
> package/qt5/qt5base/Config.in | 46 +++++++++++++++++++++++++++++++++++++++---
> package/qt5/qt5base/qt5base.mk | 18 +++++++++++++----
> 3 files changed, 62 insertions(+), 7 deletions(-)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 3/6] qt5declarative: add an option for quick module
2014-07-19 17:33 [Buildroot] [PATCH 0/6] qt5: dependency fixes Fatih Aşıcı
2014-07-19 17:33 ` [Buildroot] [PATCH 1/6] qt5multimedia: make qt5declarative dependency optional Fatih Aşıcı
2014-07-19 17:33 ` [Buildroot] [PATCH 2/6] qt5base: allow selection of OpenGL API Fatih Aşıcı
@ 2014-07-19 17:33 ` Fatih Aşıcı
2014-07-20 10:04 ` Thomas Petazzoni
2014-07-19 17:33 ` [Buildroot] [PATCH 4/6] qt5: install qmls if quick module is selected Fatih Aşıcı
` (3 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Fatih Aşıcı @ 2014-07-19 17:33 UTC (permalink / raw)
To: buildroot
With this change, qt5declarative can be built without OpenGL.
Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
---
package/qt5/qt5declarative/Config.in | 17 +++++++++++------
package/qt5/qt5declarative/qt5declarative.mk | 12 ++++++++++--
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index 4a6e805..edac8cd 100644
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -3,9 +3,6 @@ config BR2_PACKAGE_QT5DECLARATIVE
select BR2_PACKAGE_QT5XMLPATTERNS
select BR2_PACKAGE_QT5BASE
select BR2_PACKAGE_QT5BASE_GUI
- select BR2_PACKAGE_QT5BASE_EGLFS
- 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
@@ -15,6 +12,14 @@ config BR2_PACKAGE_QT5DECLARATIVE
http://qt-project.org
-comment "qt5declarative requires an OpenGL-capable backend"
- depends on (!BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES) && \
- BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+if BR2_PACKAGE_QT5DECLARATIVE
+
+comment "quick module needs an OpenGL-capable backend"
+ depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
+
+config BR2_PACKAGE_QT5DECLARATIVE_QUICK
+ bool "quick module"
+ select BR2_PACKAGE_QT5BASE_OPENGL
+ depends on BR2_PACKAGE_QT5_GL_AVAILABLE
+
+endif
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 472d092..34dd14a 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -35,12 +35,20 @@ define QT5DECLARATIVE_INSTALL_STAGING_CMDS
endef
ifeq ($(BR2_PREFER_STATIC_LIB),)
-define QT5DECLARATIVE_INSTALL_TARGET_LIBS
- cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib
+
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
+define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible $(TARGET_DIR)/usr/lib/qt/plugins
+endef
+endif
+
+define QT5DECLARATIVE_INSTALL_TARGET_LIBS
+ cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins
+ $(QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS)
endef
+
endif
define QT5DECLARATIVE_INSTALL_TARGET_CMDS
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 3/6] qt5declarative: add an option for quick module
2014-07-19 17:33 ` [Buildroot] [PATCH 3/6] qt5declarative: add an option for quick module Fatih Aşıcı
@ 2014-07-20 10:04 ` Thomas Petazzoni
2014-07-20 11:33 ` Fatih Aşıcı
0 siblings, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2014-07-20 10:04 UTC (permalink / raw)
To: buildroot
Dear Fatih A??c?,
On Sat, 19 Jul 2014 20:33:25 +0300, Fatih A??c? wrote:
> diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
> index 472d092..34dd14a 100644
> --- a/package/qt5/qt5declarative/qt5declarative.mk
> +++ b/package/qt5/qt5declarative/qt5declarative.mk
> @@ -35,12 +35,20 @@ define QT5DECLARATIVE_INSTALL_STAGING_CMDS
> endef
>
> ifeq ($(BR2_PREFER_STATIC_LIB),)
> -define QT5DECLARATIVE_INSTALL_TARGET_LIBS
> - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib
> +
> +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
> +define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS
> cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
> cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible $(TARGET_DIR)/usr/lib/qt/plugins
> +endef
> +endif
> +
> +define QT5DECLARATIVE_INSTALL_TARGET_LIBS
> + cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib
> cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins
> + $(QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS)
> endef
I am still unsure to understand what's the difference between
qt5declarative and qt5quick exactly. But here, you're installing
libQt5Qml and the qml plugins as soon as the qt5declarative package is
enabled, even if the quick module is disabled.
But then, in PATCH 4/6, you only install QML files if the quick module
is enabled. So I'm a bit confused as to what is needed to actually use
qml files.
Could you explain a bit more the interaction/difference between
qt5declarative and the quick module?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 3/6] qt5declarative: add an option for quick module
2014-07-20 10:04 ` Thomas Petazzoni
@ 2014-07-20 11:33 ` Fatih Aşıcı
0 siblings, 0 replies; 13+ messages in thread
From: Fatih Aşıcı @ 2014-07-20 11:33 UTC (permalink / raw)
To: buildroot
On Sunday 20 July 2014 12:04:31 Thomas Petazzoni wrote:
> Dear Fatih A??c?,
>
> On Sat, 19 Jul 2014 20:33:25 +0300, Fatih A??c? wrote:
> > diff --git a/package/qt5/qt5declarative/qt5declarative.mk
> > b/package/qt5/qt5declarative/qt5declarative.mk index 472d092..34dd14a
> > 100644
> > --- a/package/qt5/qt5declarative/qt5declarative.mk
> > +++ b/package/qt5/qt5declarative/qt5declarative.mk
> > @@ -35,12 +35,20 @@ define QT5DECLARATIVE_INSTALL_STAGING_CMDS
> >
> > endef
> >
> > ifeq ($(BR2_PREFER_STATIC_LIB),)
> >
> > -define QT5DECLARATIVE_INSTALL_TARGET_LIBS
> > - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib
> > +
> > +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
> > +define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS
> >
> > cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
> > cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible
> > $(TARGET_DIR)/usr/lib/qt/plugins>
> > +endef
> > +endif
> > +
> > +define QT5DECLARATIVE_INSTALL_TARGET_LIBS
> > + cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib
> >
> > cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml*
> > $(TARGET_DIR)/usr/lib/qt/plugins>
> > + $(QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS)
> >
> > endef
>
> I am still unsure to understand what's the difference between
> qt5declarative and qt5quick exactly. But here, you're installing
> libQt5Qml and the qml plugins as soon as the qt5declarative package is
> enabled, even if the quick module is disabled.
>
> But then, in PATCH 4/6, you only install QML files if the quick module
> is enabled. So I'm a bit confused as to what is needed to actually use
> qml files.
>
> Could you explain a bit more the interaction/difference between
> qt5declarative and the quick module?
qt5quick1 includes the old libs, interpreter, modules, etc. It is probably provided to
ease porting from Qt 4.x. So it has no dependency on qt5declarative.
QML is the name of the language. Quick is the name of QML module kit that is used to
create user interfaces. qt5declarative contains both the interpreter and Quick module
kit. It seems possible to use QML without Quick.
QML files in the other qt5* modules depend on Quick modules. Those are not built
when quick is disabled.
Regards,
Fatih
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140720/3a111504/attachment.html>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 4/6] qt5: install qmls if quick module is selected
2014-07-19 17:33 [Buildroot] [PATCH 0/6] qt5: dependency fixes Fatih Aşıcı
` (2 preceding siblings ...)
2014-07-19 17:33 ` [Buildroot] [PATCH 3/6] qt5declarative: add an option for quick module Fatih Aşıcı
@ 2014-07-19 17:33 ` Fatih Aşıcı
2014-07-19 17:33 ` [Buildroot] [PATCH 5/6] qt5graphicaleffects: depend on quick module Fatih Aşıcı
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Fatih Aşıcı @ 2014-07-19 17:33 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
---
package/qt5/qt5connectivity/qt5connectivity.mk | 2 +-
package/qt5/qt5enginio/qt5enginio.mk | 2 +-
package/qt5/qt5sensors/qt5sensors.mk | 2 +-
package/qt5/qt5webkit/qt5webkit.mk | 2 +-
package/qt5/qt5websockets/qt5websockets.mk | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
index 214d536..e601270 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -35,7 +35,7 @@ define QT5CONNECTIVITY_INSTALL_STAGING_CMDS
$(QT5_LA_PRL_FILES_FIXUP)
endef
-ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
define QT5CONNECTIVITY_INSTALL_TARGET_QMLS
cp -dpfr $(STAGING_DIR)/usr/qml/QtBluetooth $(TARGET_DIR)/usr/qml/
endef
diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk
index 8e4d50d..c33a405 100644
--- a/package/qt5/qt5enginio/qt5enginio.mk
+++ b/package/qt5/qt5enginio/qt5enginio.mk
@@ -35,7 +35,7 @@ define QT5ENGINIO_INSTALL_STAGING_CMDS
$(QT5_LA_PRL_FILES_FIXUP)
endef
-ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
define QT5ENGINIO_INSTALL_TARGET_QMLS
cp -dpfr $(STAGING_DIR)/usr/qml/Enginio $(TARGET_DIR)/usr/qml/
endef
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
index 1b03293..4cc0c99 100644
--- a/package/qt5/qt5sensors/qt5sensors.mk
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -42,7 +42,7 @@ define QT5SENSORS_INSTALL_TARGET_LIBS
endef
endif
-ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
define QT5SENSORS_INSTALL_TARGET_QMLS
cp -dpfr $(STAGING_DIR)/usr/qml/QtSensors $(TARGET_DIR)/usr/qml
endef
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 08c30be..c103a9c 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -39,7 +39,7 @@ define QT5WEBKIT_INSTALL_STAGING_CMDS
$(QT5_LA_PRL_FILES_FIXUP)
endef
-ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
define QT5WEBKIT_INSTALL_TARGET_QMLS
cp -dpfr $(STAGING_DIR)/usr/qml/QtWebKit $(TARGET_DIR)/usr/qml/
endef
diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index 5bfa1ed..7776414 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -35,7 +35,7 @@ define QT5WEBSOCKETS_INSTALL_STAGING_CMDS
$(QT5_LA_PRL_FILES_FIXUP)
endef
-ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
define QT5WEBSOCKETS_INSTALL_TARGET_QMLS
cp -dpfr $(STAGING_DIR)/usr/qml/Qt/WebSockets $(TARGET_DIR)/usr/qml/Qt/
endef
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 5/6] qt5graphicaleffects: depend on quick module
2014-07-19 17:33 [Buildroot] [PATCH 0/6] qt5: dependency fixes Fatih Aşıcı
` (3 preceding siblings ...)
2014-07-19 17:33 ` [Buildroot] [PATCH 4/6] qt5: install qmls if quick module is selected Fatih Aşıcı
@ 2014-07-19 17:33 ` Fatih Aşıcı
2014-07-19 17:33 ` [Buildroot] [PATCH 6/6] qt5quickcontrols: " Fatih Aşıcı
2014-07-21 20:00 ` [Buildroot] [PATCH 0/6] qt5: dependency fixes Thomas Petazzoni
6 siblings, 0 replies; 13+ messages in thread
From: Fatih Aşıcı @ 2014-07-19 17:33 UTC (permalink / raw)
To: buildroot
Also remove redundant dependencies.
Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
---
package/qt5/qt5graphicaleffects/Config.in | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in
index 2747af8..0a83638 100644
--- a/package/qt5/qt5graphicaleffects/Config.in
+++ b/package/qt5/qt5graphicaleffects/Config.in
@@ -1,10 +1,9 @@
config BR2_PACKAGE_QT5GRAPHICALEFFECTS
bool "qt5graphicaleffects"
- select BR2_PACKAGE_QT5BASE
select BR2_PACKAGE_QT5DECLARATIVE
+ select BR2_PACKAGE_QT5DECLARATIVE_QUICK
+ depends on BR2_PACKAGE_QT5_GL_AVAILABLE
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- depends on BR2_PACKAGE_HAS_LIBEGL
- depends on BR2_PACKAGE_HAS_LIBGLES
help
Qt is a cross-platform application and UI framework for
developers using C++.
@@ -13,6 +12,6 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS
http://qt-project.org
-comment "qt5graphicaleffects requires an OpenGL-capable backend"
- depends on (!BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES) && \
- BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+comment "qt5graphicaleffects needs an OpenGL-capable backend"
+ depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
+ depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 6/6] qt5quickcontrols: depend on quick module
2014-07-19 17:33 [Buildroot] [PATCH 0/6] qt5: dependency fixes Fatih Aşıcı
` (4 preceding siblings ...)
2014-07-19 17:33 ` [Buildroot] [PATCH 5/6] qt5graphicaleffects: depend on quick module Fatih Aşıcı
@ 2014-07-19 17:33 ` Fatih Aşıcı
2014-07-21 20:00 ` [Buildroot] [PATCH 0/6] qt5: dependency fixes Thomas Petazzoni
6 siblings, 0 replies; 13+ messages in thread
From: Fatih Aşıcı @ 2014-07-19 17:33 UTC (permalink / raw)
To: buildroot
Also remove redundant dependencies.
Signed-off-by: Fatih A??c? <fatih.asici@gmail.com>
---
package/qt5/qt5quickcontrols/Config.in | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
index c350a74..aae3d89 100644
--- a/package/qt5/qt5quickcontrols/Config.in
+++ b/package/qt5/qt5quickcontrols/Config.in
@@ -1,11 +1,9 @@
config BR2_PACKAGE_QT5QUICKCONTROLS
bool "qt5quickcontrols"
- select BR2_PACKAGE_QT5BASE
- select BR2_PACKAGE_QT5BASE_NETWORK
select BR2_PACKAGE_QT5DECLARATIVE
+ select BR2_PACKAGE_QT5DECLARATIVE_QUICK
+ depends on BR2_PACKAGE_QT5_GL_AVAILABLE
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- depends on BR2_PACKAGE_HAS_LIBEGL
- depends on BR2_PACKAGE_HAS_LIBGLES
help
Qt is a cross-platform application and UI framework for
developers using C++.
@@ -14,6 +12,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
http://qt-project.org
-comment "qt5quickcontrols requires an OpenGL-capable backend"
- depends on (!BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES) && \
- BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+comment "qt5quickcontrols needs an OpenGL-capable backend"
+ depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
+ depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 0/6] qt5: dependency fixes
2014-07-19 17:33 [Buildroot] [PATCH 0/6] qt5: dependency fixes Fatih Aşıcı
` (5 preceding siblings ...)
2014-07-19 17:33 ` [Buildroot] [PATCH 6/6] qt5quickcontrols: " Fatih Aşıcı
@ 2014-07-21 20:00 ` Thomas Petazzoni
6 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2014-07-21 20:00 UTC (permalink / raw)
To: buildroot
Dear Fatih A??c?,
On Sat, 19 Jul 2014 20:33:22 +0300, Fatih A??c? wrote:
> qt5declarative: add an option for quick module
> qt5: install qmls if quick module is selected
> qt5graphicaleffects: depend on quick module
> qt5quickcontrols: depend on quick module
Thanks, I've now applied those patches, therefore the series is fully
applied.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread