* [Buildroot] [PATCHv2] qt: Add option to build and install tools on the target
@ 2012-03-04 3:04 Ismael Luceno
2012-03-04 15:13 ` Arnout Vandecappelle
0 siblings, 1 reply; 3+ messages in thread
From: Ismael Luceno @ 2012-03-04 3:04 UTC (permalink / raw)
To: buildroot
Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
---
package/qt/Config.in | 23 +++++++++++++++++++++++
package/qt/qt.mk | 10 ++++++++++
2 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 3a552d0..e2c7400 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -16,6 +16,29 @@ config BR2_PACKAGE_QT_DEBUG
help
If unsure, say N.
+menuconfig BR2_PACKAGE_QT_TOOLS
+ bool "Compile and install tools"
+ depends on BR2_PACKAGE_QT_SQL_MODULE && BR2_PACKAGE_QT_GUI_MODULE
+
+if BR2_PACKAGE_QT_TOOLS
+
+config BR2_PACKAGE_QT_TOOLS_QTCONFIG
+ bool "qtconfig"
+ depends on BR2_PACKAGE_QT_GUI_X11
+
+config BR2_PACKAGE_QT_TOOLS_QMLVIEWER
+ bool "qmlviewer"
+ depends on BR2_PACKAGE_QT_DECLARATIVE
+
+config BR2_PACKAGE_QT_TOOLS_QMLPLUGINDUMP
+ bool "qmlplugindump"
+ depends on BR2_PACKAGE_QT_DECLARATIVE
+
+endif # BR2_PACKAGE_QT_TOOLS
+
+comment "Tools need the SQL and GUI modules"
+ depends on !BR2_PACKAGE_QT_SQL_MODULE || !BR2_PACKAGE_QT_GUI_MODULE
+
config BR2_PACKAGE_QT_DEMOS
bool "Compile and install demos and examples (with code)"
help
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 776eb63..ee36b8c 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -417,6 +417,12 @@ else
QT_CONFIGURE_OPTS += -no-declarative
endif
+ifeq ($(BR2_PACKAGE_QT_TOOLS),y)
+QT_CONFIGURE_OPTS += -make tools
+else
+QT_CONFIGURE_OPTS += -nomake tools
+endif
+
# ccache and precompiled headers don't play well together
ifeq ($(BR2_CCACHE),y)
QT_CONFIGURE_OPTS += -no-pch
@@ -514,6 +520,9 @@ endef
QT_INSTALL_LIBS += QtCore
QT_HOST_PROGRAMS += moc rcc qmake lrelease
+QT_TARGET_PROGRAMS += $(if $(BR2_PACKAGE_QT_TOOLS_QTCONFIG),qtconfig) \
+ $(if $(BR2_PACKAGE_QT_TOOLS_QMLVIEWER),qmlviewer) \
+ $(if $(BR2_PACKAGE_QT_TOOLS_QMLPLUGINDUMP),qmlplugindump)
ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
QT_INSTALL_LIBS += QtGui
@@ -583,6 +592,7 @@ define QT_INSTALL_STAGING_CMDS
$(MAKE) -C $(@D) install
mkdir -p $(HOST_DIR)/usr/bin
mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin
+ mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_TARGET_PROGRAMS)) $(TARGET_DIR)/usr/bin
rm -rf $(HOST_DIR)/usr/mkspecs
mv $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr
$(QT_INSTALL_QT_CONF)
--
1.7.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCHv2] qt: Add option to build and install tools on the target
2012-03-04 3:04 [Buildroot] [PATCHv2] qt: Add option to build and install tools on the target Ismael Luceno
@ 2012-03-04 15:13 ` Arnout Vandecappelle
2012-03-04 19:03 ` Ismael Luceno
0 siblings, 1 reply; 3+ messages in thread
From: Arnout Vandecappelle @ 2012-03-04 15:13 UTC (permalink / raw)
To: buildroot
On Sunday 04 March 2012 04:04:47 Ismael Luceno wrote:
>
> Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
A few comments below, but nothing critical.
> ---
> package/qt/Config.in | 23 +++++++++++++++++++++++
> package/qt/qt.mk | 10 ++++++++++
> 2 files changed, 33 insertions(+), 0 deletions(-)
>
> diff --git a/package/qt/Config.in b/package/qt/Config.in
> index 3a552d0..e2c7400 100644
> --- a/package/qt/Config.in
> +++ b/package/qt/Config.in
> @@ -16,6 +16,29 @@ config BR2_PACKAGE_QT_DEBUG
> help
> If unsure, say N.
>
> +menuconfig BR2_PACKAGE_QT_TOOLS
> + bool "Compile and install tools"
> + depends on BR2_PACKAGE_QT_SQL_MODULE && BR2_PACKAGE_QT_GUI_MODULE
This is annoying... SQL is only needed for assistant and designer, not
for qtconfig or qmlplugindump. Is there a possibility to tell qt to just
build the selected tools? That probably requires hacking
tools/tools.pro...
Maybe add to the help text of the comment, that sql isn't actually
needed except for building.
> +
> +if BR2_PACKAGE_QT_TOOLS
> +
> +config BR2_PACKAGE_QT_TOOLS_QTCONFIG
> + bool "qtconfig"
> + depends on BR2_PACKAGE_QT_GUI_X11
Doesn't qtconfig work in qws?
[snip]
> @@ -514,6 +520,9 @@ endef
>
> QT_INSTALL_LIBS += QtCore
> QT_HOST_PROGRAMS += moc rcc qmake lrelease
> +QT_TARGET_PROGRAMS += $(if $(BR2_PACKAGE_QT_TOOLS_QTCONFIG),qtconfig) \
> + $(if $(BR2_PACKAGE_QT_TOOLS_QMLVIEWER),qmlviewer) \
> + $(if $(BR2_PACKAGE_QT_TOOLS_QMLPLUGINDUMP),qmlplugindump)
Personally, I prefer the
QT_TARGET_PROGRAMS-$(BR2_PACKAGE_QT_TOOLS_QTCONFIG) += qtconfig
approach, but that's a matter of taste I guess.
>
> ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
> QT_INSTALL_LIBS += QtGui
> @@ -583,6 +592,7 @@ define QT_INSTALL_STAGING_CMDS
> $(MAKE) -C $(@D) install
> mkdir -p $(HOST_DIR)/usr/bin
> mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin
> + mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_TARGET_PROGRAMS)) $(TARGET_DIR)/usr/bin
(so that would mean putting $(QT_TARGET_PROGRAMS-y) here)
> rm -rf $(HOST_DIR)/usr/mkspecs
> mv $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr
> $(QT_INSTALL_QT_CONF)
>
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCHv2] qt: Add option to build and install tools on the target
2012-03-04 15:13 ` Arnout Vandecappelle
@ 2012-03-04 19:03 ` Ismael Luceno
0 siblings, 0 replies; 3+ messages in thread
From: Ismael Luceno @ 2012-03-04 19:03 UTC (permalink / raw)
To: buildroot
On Sun, 4 Mar 2012 16:13:47 +0100
Arnout Vandecappelle <arnout@mind.be> wrote:
> This is annoying... SQL is only needed for assistant and designer,
> not for qtconfig or qmlplugindump.
Indeed, it requires touching tools.pro :/.
> Is there a possibility to tell qt to just build the selected tools?
> That probably requires hacking tools/tools.pro...
It is also required by qmlviewer.
> > +
> > +if BR2_PACKAGE_QT_TOOLS
> > +
> > +config BR2_PACKAGE_QT_TOOLS_QTCONFIG
> > + bool "qtconfig"
> > + depends on BR2_PACKAGE_QT_GUI_X11
>
> Doesn't qtconfig work in qws?
I guess it should work, but it's excluded for embedded systems...
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20120304/fb6ca797/attachment.asc>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-04 19:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-04 3:04 [Buildroot] [PATCHv2] qt: Add option to build and install tools on the target Ismael Luceno
2012-03-04 15:13 ` Arnout Vandecappelle
2012-03-04 19:03 ` Ismael Luceno
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox