[Buildroot] [Patch 0/23] Cleanups for Qt

[Buildroot] [Patch 0/23] Cleanups for Qt

[Michael Roth]

Hello,

I assembled some cleanups for Qt. Mostly they are small changes
except twos, namely:

  [PATCH 20/23] qt: simplify and fix installing qt in the target
  [PATCH 23/23] qt: rename QT_TARGET_DIR to QT_DIR

Patch #20 removes a bunch of lines to simplify the Makfile while
Patch #23 is only esthetic surgery which could be omitted.

In summary these patches don't change (hopefully...) the current
Qt build or Kconfig for Qt in fundamental ways.

I tested the series on arm926t and x86.

Additionally I made some larger changes to Kconfig for Qt a few
months ago which I could port to the current buildroot and release
in a second series, say in a week, when desired.


Michael Roth
---
 configs/atstk100x_defconfig |    2 -
 configs/v100sc2_defconfig   |    6 +-
 package/qt/Config.in        |   43 +++----
 package/qt/qt.mk            |  292 +++++++++++++++----------------------------
 4 files changed, 123 insertions(+), 220 deletions(-)

[Buildroot] [PATCH 01/23] qt: remove useless target qt-status

[Michael Roth]

The Makefile target 'qt-status' prints pointless information,
so remove it.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 01a3635..68b4e44 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -562,11 +562,6 @@ endif
 qt-dirclean:
 	rm -rf $(QT_TARGET_DIR)
 
-qt-status:
-	@echo "QT_QMAKE:               " $(QT_QMAKE)
-	@echo "QT_DEP_LIBS:            " $(QT_DEP_LIBS)
-	@echo "FREETYPE_DIR:		    " $(FREETYPE_DIR)
-
 #############################################################
 #
 # Toplevel Makefile options
-- 
1.6.3.3

[Buildroot] [PATCH 01/23] qt: remove useless target qt-status

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:24 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> The Makefile target 'qt-status' prints pointless information,
> so remove it.

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 01/23] qt: remove useless target qt-status

[Peter Korsgaard]

>>>>> "Michael" == Michael Roth <mroth@nessie.de> writes:

 Michael> The Makefile target 'qt-status' prints pointless information,
 Michael> so remove it.

Committed, thanks

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 02/23] qt: new targets qt-uninstall and qt-confclean

[Michael Roth]

'qt-uninstall' removes Qt from the staging area and target filesystem
while 'qt-confclean' removes the results from running configure in the
Qt build directory. Use this after changes to the Qt configuration were
made to re-configure, re-build and re-install Qt.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 68b4e44..f4a63a4 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -373,6 +373,22 @@ ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
 QT_LIBS+= qt-scripttools
 endif
 
+QT_UNSTAGE_FILES := $(QT_TARGET_DIR)/.staged		\
+	$(STAGING_DIR)/usr/lib/fonts			\
+	$(STAGING_DIR)/usr/plugins			\
+	$(STAGING_DIR)/usr/translations			\
+	$(STAGING_DIR)/usr/mkspecs			\
+	$(STAGING_DIR)/usr/include/Qt*			\
+	$(STAGING_DIR)/usr/lib/libQt*			\
+	$(STAGING_DIR)/usr/lib/libphonon.*		\
+	$(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc
+
+QT_UNINSTALL_FILES := $(QT_TARGET_DIR)/.installed	\
+	$(TARGET_DIR)/usr/lib/fonts			\
+	$(TARGET_DIR)/usr/plugins			\
+	$(TARGET_DIR)/usr/lib/libQt*			\
+	$(TARGET_DIR)/usr/lib/libphonon.*
+
 QT_QMAKE_CONF:=$(QT_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++/qmake.conf
 
 QT_QMAKE_AR:=$(TARGET_AR) cqs
@@ -551,13 +567,16 @@ endif
 
 qt: $(QT_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4
 
+qt-uninstall:
+	-rm -rf $(QT_UNSTAGE_FILES) $(QT_UNINSTALL_FILES)
+
 qt-clean:
 	-$(MAKE) -C $(QT_TARGET_DIR) clean
-	-rm -rf $(TARGET_DIR)/usr/lib/fonts
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	-rm $(TARGET_DIR)/usr/lib/libQt*.so.*
-	-rm $(TARGET_DIR)/usr/lib/libphonon.so.*
-endif
+	-rm -f $(QT_TARGET_DIR)/.compiled
+
+qt-confclean:
+	-$(MAKE) -C $(QT_TARGET_DIR) confclean
+	-rm -f $(QT_TARGET_DIR)/.configured
 
 qt-dirclean:
 	rm -rf $(QT_TARGET_DIR)
-- 
1.6.3.3

[Buildroot] [PATCH 02/23] qt: new targets qt-uninstall and qt-confclean

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:25 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> 'qt-uninstall' removes Qt from the staging area and target filesystem
> while 'qt-confclean' removes the results from running configure in the
> Qt build directory. Use this after changes to the Qt configuration
> were made to re-configure, re-build and re-install Qt.

Concerning the qt-uninstall, I'm not sure we want to clutter all
packages with proper uninstallation procedure. I'm working on something
that would work for all packages, without any particular support from
the package .mk file.

However, I don't think this work will be ready and stabilized for the
2009.11 release. So should we include this stuff or keep the status
quo ? No strong opinion on this.

For the qt-confclean, ack, but we should document this somewhere, as
this is package-specific. Perhaps we should either:

 * Add a section in the documentation on package specific things

 * Add a README file in the package/<pkgname>/ directory that describes
   some package-specific stuff

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 03/23] qt: enable proper re-configure

[Michael Roth]

The Qt configure script doesn't use config.cache but the
generated Makefile provides a confclean target to properly
clean out old configuration.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index f4a63a4..7189f03 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -442,6 +442,7 @@ $(QT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QT_SOURCE)
 	touch $@
 
 $(QT_TARGET_DIR)/.configured: $(QT_TARGET_DIR)/.unpacked
+	-[ -f $(QT_TARGET_DIR)/Makefile ] && $(MAKE) -C $(QT_TARGET_DIR) confclean
 ifneq ($(BR2_INET_IPV6),y)
 	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QT_TARGET_DIR)/configure
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QT_TARGET_DIR)/configure
@@ -466,7 +467,7 @@ endif
 # when cross compiling, Qt 4.4.3 is wrong here.
 # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
 # instead of the host then.
-	(cd $(QT_TARGET_DIR); rm -rf config.cache; \
+	(cd $(QT_TARGET_DIR); \
 		PATH=$(TARGET_PATH) \
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
-- 
1.6.3.3

[Buildroot] [PATCH 03/23] qt: enable proper re-configure

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:26 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> The Qt configure script doesn't use config.cache but the
> generated Makefile provides a confclean target to properly
> clean out old configuration.

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 03/23] qt: enable proper re-configure

[Peter Korsgaard]

>>>>> "Michael" == Michael Roth <mroth@nessie.de> writes:

 Michael> The Qt configure script doesn't use config.cache but the
 Michael> generated Makefile provides a confclean target to properly
 Michael> clean out old configuration.

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 04/23] qt: remove Makefile variable QT_QMAKE_AR

[Michael Roth]

The variable is only referenced once, so inline it.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 7189f03..6351baa 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -391,8 +391,6 @@ QT_UNINSTALL_FILES := $(QT_TARGET_DIR)/.installed	\
 
 QT_QMAKE_CONF:=$(QT_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++/qmake.conf
 
-QT_QMAKE_AR:=$(TARGET_AR) cqs
-
 # Variable for other Qt applications to use
 QT_QMAKE:=$(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++
 
@@ -453,7 +451,7 @@ endif
 	$(call QT_QMAKE_SET,CXX,$(TARGET_CXX))
 	$(call QT_QMAKE_SET,LINK,$(TARGET_CXX))
 	$(call QT_QMAKE_SET,LINK_SHLIB,$(TARGET_CXX))
-	$(call QT_QMAKE_SET,AR,$(QT_QMAKE_AR))
+	$(call QT_QMAKE_SET,AR,$(TARGET_AR) cqs)
 	$(call QT_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY))
 	$(call QT_QMAKE_SET,RANLIB,$(TARGET_RANLIB))
 	$(call QT_QMAKE_SET,STRIP,$(TARGET_STRIP))
-- 
1.6.3.3

[Buildroot] [PATCH 04/23] qt: remove Makefile variable QT_QMAKE_AR

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:27 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> The variable is only referenced once, so inline it.
> 
> Signed-off-by: Michael Roth <mroth@nessie.de>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 04/23] qt: remove Makefile variable QT_QMAKE_AR

[Peter Korsgaard]

>>>>> "Michael" == Michael Roth <mroth@nessie.de> writes:

 Michael> The variable is only referenced once, so inline it.

Commmitted, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 05/23] qt: remove Makefile variable QT_QMAKE

[Michael Roth]

The variable is no longer referenced by any buildroot code and not
needed by external programs.

Once upon a time there was a problem with 'qmake' not finding its
spec file. But this problem in gone in the meantime.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 6351baa..f0fdfdd 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -391,9 +391,6 @@ QT_UNINSTALL_FILES := $(QT_TARGET_DIR)/.installed	\
 
 QT_QMAKE_CONF:=$(QT_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++/qmake.conf
 
-# Variable for other Qt applications to use
-QT_QMAKE:=$(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++
-
 ################################################################################
 # QT_QMAKE_SET -- helper macro to set QMAKE_<variable> = <value> in
 # QT_QMAKE_CONF. Will remove existing variable declaration if available.
-- 
1.6.3.3

[Buildroot] [PATCH 05/23] qt: remove Makefile variable QT_QMAKE

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:28 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> The variable is no longer referenced by any buildroot code and not
> needed by external programs.

Well, it *might* be useful for people willing to add their own Qt
applications, using the qmake build system, into the Buildroot
infrastructure.

But unless this is documented somewhere, this is useless. So we should
either:

 * Remove it

 * Keep it, but document it somwhere. See my suggestions associated to
   patch 02/23 for details

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 05/23] qt: remove Makefile variable QT_QMAKE

[Thiago A. Corrêa]

Hi,

On Wed, Oct 7, 2009 at 6:20 AM, Michael Roth <mroth@nessie.de> wrote:
> The variable is no longer referenced by any buildroot code and not
> needed by external programs.
>
> Once upon a time there was a problem with 'qmake' not finding its
> spec file. But this problem in gone in the meantime.
>
> Signed-off-by: Michael Roth <mroth@nessie.de>

I use it in at least 3 private packages. It might be that it's not
necessary anymore, I didn't try, but it certainly isn't "unused".

Kind Regards,
    Thiago A. Correa

[Buildroot] [PATCH 06/23] qt: remove TARGET_CONFIGURE_OPTS from make invocation

[Michael Roth]

All compiler options, switches and path settings are done in the
configure step. For the compile and install step there is no need
for the TARGET_CONFIGURE_OPTS variables.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index f0fdfdd..e965a42 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -487,11 +487,11 @@ endif
 	touch $@
 
 $(QT_TARGET_DIR)/.compiled: $(QT_TARGET_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QT_TARGET_DIR)
+	$(MAKE) -C $(QT_TARGET_DIR)
 	touch $@
 
 $(STAGING_DIR)/usr/lib/libQtCore.la: $(QT_TARGET_DIR)/.compiled
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QT_TARGET_DIR) install
+	$(MAKE) -C $(QT_TARGET_DIR) install
 
 qt-gui: $(STAGING_DIR)/usr/lib/libQtCore.la
 	mkdir -p $(TARGET_DIR)/usr/lib/fonts
-- 
1.6.3.3

[Buildroot] [PATCH 06/23] qt: remove TARGET_CONFIGURE_OPTS from make invocation

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:29 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> All compiler options, switches and path settings are done in the
> configure step. For the compile and install step there is no need
> for the TARGET_CONFIGURE_OPTS variables.
> 
> Signed-off-by: Michael Roth <mroth@nessie.de>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 06/23] qt: remove TARGET_CONFIGURE_OPTS from make invocation

[Peter Korsgaard]

>>>>> "Michael" == Michael Roth <mroth@nessie.de> writes:

 Michael> All compiler options, switches and path settings are done in the
 Michael> configure step. For the compile and install step there is no need
 Michael> for the TARGET_CONFIGURE_OPTS variables.

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 07/23] qt: remove PKG_CONFIG workaround

[Michael Roth]

At least Qt 4.5.2 is fixed in the meantime and honors PKG_CONFIG.
So the PATH workaround is no longer needed.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index e965a42..8dac3ca 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -457,16 +457,12 @@ endif
 	$(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS))
 	-[ -f $(QT_QCONFIG_FILE) ] && cp $(QT_QCONFIG_FILE) \
 		$(QT_TARGET_DIR)/$(QT_QCONFIG_FILE_LOCATION)
-# Qt doesn't use PKG_CONFIG, it searches for pkg-config with 'which'.
-# PKG_CONFIG_SYSROOT is only used to avoid a warning from Qt's configure system
-# when cross compiling, Qt 4.4.3 is wrong here.
 # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
-# instead of the host then.
+# instead of the host then. So set PKG_CONFIG* manually.
 	(cd $(QT_TARGET_DIR); \
-		PATH=$(TARGET_PATH) \
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
+		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
-		PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
 		./configure \
 		$(if $(VERBOSE),-verbose,-silent) \
 		-force-pkg-config \
-- 
1.6.3.3

[Buildroot] [PATCH 07/23] qt: remove PKG_CONFIG workaround

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:30 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> At least Qt 4.5.2 is fixed in the meantime and honors PKG_CONFIG.
> So the PATH workaround is no longer needed.

Ok (if it has been tested, of course), but:

> -		PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \

Must be kept for correct operation of pkg-config. Otherwise, paths
returned by pkg-config will be incorrect.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 07/23] qt: remove PKG_CONFIG workaround

[Michael Roth]

Am Wednesday 07 October 2009 11:44:01 schrieb Thomas Petazzoni:
> Le Wed,  7 Oct 2009 11:20:30 +0200,
>
> Michael Roth <mroth@nessie.de> a ?crit :
> > At least Qt 4.5.2 is fixed in the meantime and honors PKG_CONFIG.
> > So the PATH workaround is no longer needed.
>
> Ok (if it has been tested, of course), but:
> > -		PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
>
> Must be kept for correct operation of pkg-config. Otherwise, paths
> returned by pkg-config will be incorrect.

Sure? I spy on package/Makefile.in which defines (line 238):

	TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
		... \
		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)"

There is no PKG_CONFIG_SYSROOT but PKG_CONFIG_SYSROOT_DIR.


Michael Roth

[Buildroot] [PATCH 07/23] qt: remove PKG_CONFIG workaround

[Thomas Petazzoni]

Le Wed, 7 Oct 2009 12:19:10 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> There is no PKG_CONFIG_SYSROOT but PKG_CONFIG_SYSROOT_DIR.

Oh indeed. My mistake, your patch is fully correct.

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 07/23] qt: remove PKG_CONFIG workaround

[Peter Korsgaard]

>>>>> "Michael" == Michael Roth <mroth@nessie.de> writes:

 Michael> At least Qt 4.5.2 is fixed in the meantime and honors PKG_CONFIG.
 Michael> So the PATH workaround is no longer needed.

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 08/23] qt: remove no longer needed 'x86x86fix' workaround

[Michael Roth]

Tested with 4.5.2.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 8dac3ca..85ff9a6 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -17,10 +17,6 @@
 # (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
 # to fix
 
-# BUG: There is a workaround below (search for x86x86fix) for
-# x86 crosscompiling under linux x86. Please remove it when the workaround
-# is no longer necessary.
-
 QT_VERSION:=4.5.2
 QT_CAT:=$(BZCAT)
 
@@ -329,17 +325,6 @@ endif
 QT_CONFIGURE:=$(call qstrip,$(QT_CONFIGURE))
 BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
 
-# x86x86fix
-# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
-# host. It's unclear if this would happen on other hosts.
-ifneq ($(findstring pc-linux,$(BR2_GNU_BUILD_SUFFIX)),)
-ifeq ($(BR2_PACKAGE_QT_EMB_PLATFORM),x86)
-QT_CONFIGURE+= -platform linux-g++
-QT_CONFIGURE:=$(call qstrip,$(QT_CONFIGURE))
-endif
-endif
-# End of workaround.
-
 # Figure out what libs to install in the target
 QT_LIBS=#empty
 ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-- 
1.6.3.3

[Buildroot] [PATCH 08/23] qt: remove no longer needed 'x86x86fix' workaround

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:31 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> Tested with 4.5.2.

Are you sure about this ? This workaround was added in April 2009, when
the Qt version we packaged was 4.5.0. Was it fixed in the mean time ?

Did you try a configuration with an x86/uClibc toolchain on an x86
host ? I also remember from confusions between the mkspecs file to be
used for compiling host tools and target tools/libraries.

Note: I'm absolutely unsure whether the workaround is needed. I'm just
asking for simple clarifications, not trying to be offensive in anyway.
I really do appreciate the work you did to clean-up the Qt packaging.

Sincerly,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 08/23] qt: remove no longer needed 'x86x86fix' workaround

[Michael Roth]

Am Wednesday 07 October 2009 11:55:14 schrieb Thomas Petazzoni:
> Le Wed,  7 Oct 2009 11:20:31 +0200,
>
> Michael Roth <mroth@nessie.de> a ?crit :
> > Tested with 4.5.2.
>
> Are you sure about this ? This workaround was added in April 2009, when
> the Qt version we packaged was 4.5.0. Was it fixed in the mean time ?

Yes (at least, I think... ;-)


> Did you try a configuration with an x86/uClibc toolchain on an x86
> host ? I also remember from confusions between the mkspecs file to be
> used for compiling host tools and target tools/libraries.

I built on a x86 box a full cross-toolchain f?r x86/uClibc. I even compiled
the analogclock example from Qt and run it and it worked flawless.

From the Qt-configure output on this test:

	[...]
	Building on:   linux-g++
	Building for:  qws/linux-x86-g++
	Architecture:  i386
	Host architecture: i386
	[...]

So it looks like that Qt-configure is getting this fully right. I also 
read the configure-script from Qt and found no reason for this x86x86fix.
But I didn't checked older Qt version.


> Note: I'm absolutely unsure whether the workaround is needed. I'm just
> asking for simple clarifications, not trying to be offensive in anyway.

No problem.


Michael Roth

[Buildroot] [PATCH 08/23] qt: remove no longer needed 'x86x86fix' workaround

[Thomas Petazzoni]

Le Wed, 7 Oct 2009 12:26:31 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> I built on a x86 box a full cross-toolchain f?r x86/uClibc. I even
> compiled the analogclock example from Qt and run it and it worked
> flawless.
> 
> From the Qt-configure output on this test:
> 
> 	[...]
> 	Building on:   linux-g++
> 	Building for:  qws/linux-x86-g++
> 	Architecture:  i386
> 	Host architecture: i386
> 	[...]
> 
> So it looks like that Qt-configure is getting this fully right. I
> also read the configure-script from Qt and found no reason for this
> x86x86fix. But I didn't checked older Qt version.

Perfect.

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 08/23] qt: remove no longer needed 'x86x86fix' workaround

[Michael Roth]

Just, for information, I found a commit in the Qt-tree which looks
like it was the fix for this old problem:

	http://qt.gitorious.org/qt/qt/commit/28d2b22a940174b4e64f6fa2f5548a7832fc07e8

This commit precedes 4.5.2. So looks like that this issue got really
fixed in Qt upstream.

[Buildroot] [PATCH 09/23] qt: remove unnecessary comment

[Michael Roth]

Qt in buildroot should not depend on dbus installed on build platform,
if so this is (or was) a bug in buildroot.

Looks like that this note is left over from ancient buildroot days,
so remove it.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 85ff9a6..c61d70c 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -12,11 +12,6 @@
 #
 ######################################################################
 
-# BUG: In "OpenSuSE 10.2", dbus.h is at dbus-1.0/dbus/dbus.h
-# instead of at "dbus/dbus.h"
-# (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
-# to fix
-
 QT_VERSION:=4.5.2
 QT_CAT:=$(BZCAT)
 
-- 
1.6.3.3

[Buildroot] [PATCH 09/23] qt: remove unnecessary comment

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:32 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> Qt in buildroot should not depend on dbus installed on build platform,
> if so this is (or was) a bug in buildroot.
> 
> Looks like that this note is left over from ancient buildroot days,
> so remove it.
> 
> Signed-off-by: Michael Roth <mroth@nessie.de>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 09/23] qt: remove unnecessary comment

[Peter Korsgaard]

>>>>> "Michael" == Michael Roth <mroth@nessie.de> writes:

 Michael> Qt in buildroot should not depend on dbus installed on build platform,
 Michael> if so this is (or was) a bug in buildroot.

 Michael> Looks like that this note is left over from ancient buildroot days,
 Michael> so remove it.

Commited, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 10/23] qt: don't enable internal tslib-module debugging

[Michael Roth]

In Qt there are virtually hundreds of internal debug flags like
TSLIBMOUSEHANDLER_DEBUG for every module or even C++ class. There
is no reason to enable a single such flag when Qt is build with
debugging symbols and others not.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index c61d70c..47009e8 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -153,8 +153,6 @@ endif
 ifeq ($(BR2_PACKAGE_QT_MOUSE_TSLIB),y)
 QT_CONFIGURE += -qt-mouse-tslib
 QT_DEP_LIBS+=tslib
-QT_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG"
-QT_TSLIB_DEB:=$(call qstrip,$(QT_TSLIB_DEB))
 else
 QT_CONFIGURE += -no-mouse-tslib
 endif
@@ -165,7 +163,7 @@ QT_CONFIGURE += -no-mouse-qvfb
 endif
 
 ifeq ($(BR2_PACKAGE_QT_DEBUG),y)
-QT_CONFIGURE+= "-debug $(QT_TSLIB_DEB)"
+QT_CONFIGURE+= -debug
 else
 QT_CONFIGURE+= -release
 endif
-- 
1.6.3.3

[Buildroot] [PATCH 10/23] qt: don't enable internal tslib-module debugging

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:33 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> In Qt there are virtually hundreds of internal debug flags like
> TSLIBMOUSEHANDLER_DEBUG for every module or even C++ class. There
> is no reason to enable a single such flag when Qt is build with
> debugging symbols and others not.
> 
> Signed-off-by: Michael Roth <mroth@nessie.de>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

If needed in the future, we can add a "Extra Qt configure flags" option
if there is some need for it. In the mean time, fully agree.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 10/23] qt: don't enable internal tslib-module debugging

[Peter Korsgaard]

>>>>> "Michael" == Michael Roth <mroth@nessie.de> writes:

 Michael> In Qt there are virtually hundreds of internal debug flags like
 Michael> TSLIBMOUSEHANDLER_DEBUG for every module or even C++ class. There
 Michael> is no reason to enable a single such flag when Qt is build with
 Michael> debugging symbols and others not.

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 11/23] qt: remove unnecessary call to qstrip macro in Makefile

[Michael Roth]

QT_CONFIGURE can never gain double quotes, so there
is no point to remove some.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 47009e8..9d80437 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -315,7 +315,6 @@ else
 QT_CONFIGURE+= -no-stl
 endif
 
-QT_CONFIGURE:=$(call qstrip,$(QT_CONFIGURE))
 BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
 
 # Figure out what libs to install in the target
-- 
1.6.3.3

[Buildroot] [PATCH 11/23] qt: remove unnecessary call to qstrip macro in Makefile

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:34 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> QT_CONFIGURE can never gain double quotes, so there
> is no point to remove some.
> 
> Signed-off-by: Michael Roth <mroth@nessie.de>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 11/23] qt: remove unnecessary call to qstrip macro in Makefile

[Peter Korsgaard]

>>>>> "Michael" == Michael Roth <mroth@nessie.de> writes:

 Michael> QT_CONFIGURE can never gain double quotes, so there
 Michael> is no point to remove some.

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 12/23] qt: respect silent mode instead non existing verbose mode

[Michael Roth]

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 9d80437..b12d3eb 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -441,7 +441,7 @@ endif
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
 		./configure \
-		$(if $(VERBOSE),-verbose,-silent) \
+		$(if $(QUIET),-silent,-verbose) \
 		-force-pkg-config \
 		-embedded $(BR2_PACKAGE_QT_EMB_PLATFORM) \
 		$(QT_QCONFIG_COMMAND) \
-- 
1.6.3.3

[Buildroot] [PATCH 12/23] qt: respect silent mode instead non existing verbose mode

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:35 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

I'm not sure about this one. In the main Makefile, we definitely define
VERBOSE, but not QUIET.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 12/23] qt: respect silent mode instead non existing verbose mode

[Michael Roth]

Am Wednesday 07 October 2009 11:57:41 schrieb Thomas Petazzoni:
> I'm not sure about this one. In the main Makefile, we definitely define
> VERBOSE, but not QUIET.

Commit 89464a96015e89da07b87d18b31f4b25b4c890ba introduced QUIET.

But you're right. I overlooked VERBOSE. Maybe this should be split
into two ifs?


Michael Roth

[Buildroot] [PATCH 12/23] qt: respect silent mode instead non existing verbose mode

[Thomas Petazzoni]

Le Wed, 7 Oct 2009 12:30:43 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> Commit 89464a96015e89da07b87d18b31f4b25b4c890ba introduced QUIET.

Hum correct. My tree was in branch not rebased against the very latest
Buildroot git.

> But you're right. I overlooked VERBOSE. Maybe this should be split
> into two ifs?

I think we should make a formal decision on the respective semantic of
VERBOSE and QUIET, because the difference between these two variables
is not clear to me.

Peter ?

Sincerly,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 12/23] qt: respect silent mode instead non existing verbose mode

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Le Wed, 7 Oct 2009 12:30:43 +0200,
 Thomas> Michael Roth <mroth@nessie.de> a ?crit :

 >> Commit 89464a96015e89da07b87d18b31f4b25b4c890ba introduced QUIET.

 Thomas> Hum correct. My tree was in branch not rebased against the very latest
 Thomas> Buildroot git.

FYI, that commit just reintroduced it, as it got lost in the
reorganization. We've had it for ~1 year before that (43af3d3578(.

 >> But you're right. I overlooked VERBOSE. Maybe this should be split
 >> into two ifs?

 Thomas> I think we should make a formal decision on the respective semantic of
 Thomas> VERBOSE and QUIET, because the difference between these two variables
 Thomas> is not clear to me.

Yes, it's a bit of a mess. Is there anything using VERBOSE yet? The
complains with BR has historically been that it has been TOO verbose,
not too less.

Maybe this would be a good subject for the dev day?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 12/23] qt: respect silent mode instead non existing verbose mode

[Thomas Petazzoni]

Le Wed, 07 Oct 2009 13:27:58 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :

> Maybe this would be a good subject for the dev day?

Definetely. I was anyway planning to present my proposal of a very
silent Buildroot mode (presented a few weeks ago on the list with a
prototype proposal), so this will be on the list of topics to discuss.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 12/23] qt: respect silent mode instead non existing verbose mode

[Bernhard Reutner-Fischer]

On Wed, Oct 07, 2009 at 12:30:43PM +0200, Michael Roth wrote:
>Am Wednesday 07 October 2009 11:57:41 schrieb Thomas Petazzoni:
>> I'm not sure about this one. In the main Makefile, we definitely define
>> VERBOSE, but not QUIET.
>
>Commit 89464a96015e89da07b87d18b31f4b25b4c890ba introduced QUIET.
>
>But you're right. I overlooked VERBOSE. Maybe this should be split
>into two ifs?

can't you use the configure invocation of autotools.in?
$(if $(VERBOSE),--verbose,$(if $(SILENT),--silent,))
(modulo real names) i.e. if VERBOSE is set, use it, else maybe use
silent or just leave it at defaults.

[Buildroot] [PATCH 12/23] qt: respect silent mode instead non existing verbose mode

[Peter Korsgaard]

>>>>> "Bernhard" == Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:

Hi,

 Bernhard> can't you use the configure invocation of autotools.in?
 Bernhard> $(if $(VERBOSE),--verbose,$(if $(SILENT),--silent,))
 Bernhard> (modulo real names) i.e. if VERBOSE is set, use it, else maybe use
 Bernhard> silent or just leave it at defaults.

We already do something like that for QUIET, E.G. configure gets a -q
argument to make it shut up.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 13/23] qt: use configure option instead a sed hack to disable xinerama

[Michael Roth]

The Qt configure script gained the option '-no-xinerama' in the
meantime. So use it instead hacking the script itself using sed.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index b12d3eb..08995d4 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -419,7 +419,6 @@ ifneq ($(BR2_INET_IPV6),y)
 	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QT_TARGET_DIR)/configure
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QT_TARGET_DIR)/configure
 endif
-	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QT_TARGET_DIR)/configure
 	# Fix compiler path
 	$(call QT_QMAKE_SET,CC,$(TARGET_CC))
 	$(call QT_QMAKE_SET,CXX,$(TARGET_CXX))
@@ -446,6 +445,7 @@ endif
 		-embedded $(BR2_PACKAGE_QT_EMB_PLATFORM) \
 		$(QT_QCONFIG_COMMAND) \
 		$(QT_CONFIGURE) \
+		-no-xinerama \
 		-no-cups \
 		-no-nis \
 		-no-accessibility \
-- 
1.6.3.3

[Buildroot] [PATCH 13/23] qt: use configure option instead a sed hack to disable xinerama

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:36 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> The Qt configure script gained the option '-no-xinerama' in the
> meantime. So use it instead hacking the script itself using sed.
> 
> Signed-off-by: Michael Roth <mroth@nessie.de>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 13/23] qt: use configure option instead a sed hack to disable xinerama

[Peter Korsgaard]

>>>>> "Michael" == Michael Roth <mroth@nessie.de> writes:

 Michael> The Qt configure script gained the option '-no-xinerama' in the
 Michael> meantime. So use it instead hacking the script itself using sed.

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 14/23] qt: make the output of sed hacks much more human readable

[Michael Roth]

Make the console output from the QT_QMAKE_SET macro much more
human readable and additionally respect the QUIET flag.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 08995d4..ca6ae6b 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -379,8 +379,9 @@ QT_QMAKE_CONF:=$(QT_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)
 # $(call QT_QMAKE_SET,variable,value)
 ################################################################################
 define QT_QMAKE_SET
-	$(SED) '/QMAKE_$(1)/d' $(QT_QMAKE_CONF)
-	$(SED) '/include.*qws.conf/aQMAKE_$(1) = $(2)' $(QT_QMAKE_CONF)
+	@$(if $(QUIET), , echo '$(QT_QMAKE_CONF): QMAKE_$(1) = $(2)')
+	@$(SED) '/QMAKE_$(1)/d' $(QT_QMAKE_CONF)
+	@$(SED) '/include.*qws.conf/aQMAKE_$(1) = $(2)' $(QT_QMAKE_CONF)
 endef
 
 ################################################################################
-- 
1.6.3.3

[Buildroot] [PATCH 14/23] qt: make the output of sed hacks much more human readable

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:37 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> Make the console output from the QT_QMAKE_SET macro much more
> human readable and additionally respect the QUIET flag.

Two remarks:

 1. Same question on $(QUIET) vs $(VERBOSE) as in patch 12/23

 2. You should probably use $(Q) instead of @ on the $(SED) lines so
    that the user doing "make V=1" will still get the real command lines

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 14/23] qt: make the output of sed hacks much more human readable

[Michael Roth]

Am Wednesday 07 October 2009 11:59:41 schrieb Thomas Petazzoni:
>  2. You should probably use $(Q) instead of @ on the $(SED) lines so
>     that the user doing "make V=1" will still get the real command lines

Yes, I will change this. Thanks.


Michael Roth

[Buildroot] [PATCH 15/23] qt: make sure to install all Qt-fonts and true-type-fonts

[Michael Roth]

Qt gained some more qpf-fonts and also provides some true-type-fonts.
Make sure to install them all inclusive ttf-fonts when freetype-support
is enabled. Additionally the empty 'fontdir' file is really not needed.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index ca6ae6b..f1e845e 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -469,10 +469,10 @@ $(STAGING_DIR)/usr/lib/libQtCore.la: $(QT_TARGET_DIR)/.compiled
 
 qt-gui: $(STAGING_DIR)/usr/lib/libQtCore.la
 	mkdir -p $(TARGET_DIR)/usr/lib/fonts
-	touch $(TARGET_DIR)/usr/lib/fonts/fontdir
-	cp -dpf $(STAGING_DIR)/usr/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts
-	cp -dpf $(STAGING_DIR)/usr/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts
-	cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
+	cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.qpf $(TARGET_DIR)/usr/lib/fonts
+ifneq ($(BR2_PACKAGE_QT_NOFREETYPE),y)
+	cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
+endif
 	# Install image plugins if they are built
 	$(call QT_INSTALL_PLUGINS,imageformats)
 ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-- 
1.6.3.3

[Buildroot] [PATCH 15/23] qt: make sure to install all Qt-fonts and true-type-fonts

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:38 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> Qt gained some more qpf-fonts and also provides some true-type-fonts.
> Make sure to install them all inclusive ttf-fonts when
> freetype-support is enabled. Additionally the empty 'fontdir' file is
> really not needed.
> 
> Signed-off-by: Michael Roth <mroth@nessie.de>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Even though this test:

ifneq ($(BR2_PACKAGE_QT_NOFREETYPE),y)

is really segfaulting my brain. You're not testing whether a not option
is not equal to not yes. Maybe we should s/QT_NOFREETYPE/QT_FREETYPE/
and reverse all the logic :-)

not (! Thomas)
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 15/23] qt: make sure to install all Qt-fonts and true-type-fonts

[Michael Roth]

Am Wednesday 07 October 2009 12:02:20 schrieb Thomas Petazzoni:
> Even though this test:
>
> ifneq ($(BR2_PACKAGE_QT_NOFREETYPE),y)
>
> is really segfaulting my brain.

Yes, I know. Ugly. I don't like it much, too. This should go away when
the whole Kconfig stuff for Qt gets reworked. But in the meantime...


Michael Roth

[Buildroot] [PATCH 15/23] qt: make sure to install all Qt-fonts and true-type-fonts

[Peter Korsgaard]

>>>>> "Michael" == Michael Roth <mroth@nessie.de> writes:

 Michael> Qt gained some more qpf-fonts and also provides some
 Michael> true-type-fonts.  Make sure to install them all inclusive
 Michael> ttf-fonts when freetype-support is enabled. Additionally the
 Michael> empty 'fontdir' file is really not needed.

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 16/23] qt: disable precompiled headers when ccache is enabled

[Michael Roth]

ccache and precompiled headers don't work together, so disable
precompiled headers when ccache is enabled.

The benefit of ccache compiling Qt a second or more time is much
higher than the costs of disabled precompiled headers in the first run.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index f1e845e..8491195 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -315,6 +315,11 @@ else
 QT_CONFIGURE+= -no-stl
 endif
 
+# ccache and precompiled headers don't play well together
+ifeq ($(BR2_CCACHE),y)
+QT_CONFIGURE += -no-pch
+endif
+
 BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
 
 # Figure out what libs to install in the target
-- 
1.6.3.3

[Buildroot] [PATCH 16/23] qt: disable precompiled headers when ccache is enabled

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:39 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> ccache and precompiled headers don't work together, so disable
> precompiled headers when ccache is enabled.
> 
> The benefit of ccache compiling Qt a second or more time is much
> higher than the costs of disabled precompiled headers in the first
> run.
> 
> Signed-off-by: Michael Roth <mroth@nessie.de>

Never used CCACHE in Buildroot, so never tried this or faced the issue,
but anway:

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 16/23] qt: disable precompiled headers when ccache is enabled

[Peter Korsgaard]

>>>>> "Michael" == Michael Roth <mroth@nessie.de> writes:

 Michael> ccache and precompiled headers don't work together, so disable
 Michael> precompiled headers when ccache is enabled.

 Michael> The benefit of ccache compiling Qt a second or more time is
 Michael> much higher than the costs of disabled precompiled headers in
 Michael> the first run.

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 17/23] qt: add explicit Kconfig option to enable exceptions

[Michael Roth]

Don't implicitly enable exceptions when the XML-Patterns-Modul is
build, instead provide an separate entry in the Kconfig menu.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/Config.in |    7 +++++++
 package/qt/qt.mk     |    8 +++++++-
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index b7fe0f9..48efac2 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -287,6 +287,7 @@ config BR2_PACKAGE_QT_XML
 config BR2_PACKAGE_QT_XMLPATTERNS
 	bool "XML Patterns Module"
 	depends on BR2_PACKAGE_QT_XML
+	select BR2_PACKAGE_QT_EXCEPTIONS
 	help
 	  Build QtXmlPatterns module.
 	  If unsure, say n
@@ -311,6 +312,12 @@ config BR2_PACKAGE_QT_WEBKIT
 	  Build the WebKit module.
 	  If unsure, say n.
 
+config BR2_PACKAGE_QT_EXCEPTIONS
+	bool "Exceptions support"
+	help
+	  Compile Qt with exceptions enabled.
+	  If unsure, say N.
+
 config BR2_PACKAGE_QT_STL
 	bool "STL support"
 	help
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 8491195..a747b40 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -285,7 +285,7 @@ QT_CONFIGURE+= -no-sql-sqlite
 endif
 
 ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
-QT_CONFIGURE+= -xmlpatterns -exceptions
+QT_CONFIGURE+= -xmlpatterns
 else
 QT_CONFIGURE+= -no-xmlpatterns
 endif
@@ -309,6 +309,12 @@ else
 QT_CONFIGURE+= -no-webkit
 endif
 
+ifeq ($(BR2_PACKAGE_QT_EXCEPTIONS),y)
+QT_CONFIGURE += -exceptions
+else
+QT_CONFIGURE += -no-exceptions
+endif
+
 ifeq ($(BR2_PACKAGE_QT_STL),y)
 QT_CONFIGURE+= -stl
 else
-- 
1.6.3.3

[Buildroot] [PATCH 17/23] qt: add explicit Kconfig option to enable exceptions

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:40 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> Don't implicitly enable exceptions when the XML-Patterns-Modul is
> build, instead provide an separate entry in the Kconfig menu.

Is there a need to be able to explicitly enable/disable exceptions ?

I'm not against the patch, but I'm wondering if we really need to add
yet another Kconfig option for such a thing.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 18/23] qt: remove Kconfig option to enable all pixel depths

[Michael Roth]

The Kconfig menu "Pixel depths" of Qt provides a list with all
selectable pixel depths and additionally the option "all".

When "all" is selected, the list with all available pixel depths
disappears.

Because this disappearing of available pixel depths makes no sense
under usability aspects, simply remove the option "all".

The user could enable all available pixel depths by selecting each
individual depth anyway. So no functionality is lost.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 configs/atstk100x_defconfig |    1 -
 configs/v100sc2_defconfig   |    4 +++-
 package/qt/Config.in        |    6 ------
 package/qt/qt.mk            |    5 +----
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index 7b6d426..9207895 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -702,7 +702,6 @@ BR2_PACKAGE_QT_GUI_MODULE=y
 #
 # Deselecting each option leads to Qt's default (8,16,32)
 #
-# BR2_PACKAGE_QT_PIXEL_DEPTH_ALL is not set
 # BR2_PACKAGE_QT_PIXEL_DEPTH_1 is not set
 # BR2_PACKAGE_QT_PIXEL_DEPTH_4 is not set
 BR2_PACKAGE_QT_PIXEL_DEPTH_8=y
diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index f444951..fcece77 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -550,7 +550,9 @@ BR2_PACKAGE_QT_LICENSE_TYPE_GPL=y
 # BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL is not set
 BR2_PACKAGE_QT_GPL_LICENSE_APPROVED=y
 # BR2_PACKAGE_QT_QT3SUPPORT is not set
-BR2_PACKAGE_QT_DEPTHS="-depths 24,16,8"
+BR2_PACKAGE_QT_PIXEL_DEPTH_8=y
+BR2_PACKAGE_QT_PIXEL_DEPTH_16=y
+BR2_PACKAGE_QT_PIXEL_DEPTH_24=y
 BR2_PACKAGE_QT_GIF=y
 # BR2_PACKAGE_QT_LIBMNG is not set
 # BR2_PACKAGE_QT_NOJPEG is not set
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 48efac2..5ab2dde 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -87,11 +87,6 @@ if BR2_PACKAGE_QT_GUI_MODULE
 menu "Pixel depths"
 comment "Deselecting each option leads to Qt's default (8,16,32)"
 
-config BR2_PACKAGE_QT_PIXEL_DEPTH_ALL
-	bool "All supported depths"
-
-if !BR2_PACKAGE_QT_PIXEL_DEPTH_ALL
-
 config BR2_PACKAGE_QT_PIXEL_DEPTH_1
 	bool "1 bpp, black/white"
 
@@ -122,7 +117,6 @@ config BR2_PACKAGE_QT_PIXEL_DEPTH_32
 	bool "32 bpp, argb 8-8-8-8 and rgb 8-8-8"
 	default y
 
-endif
 endmenu
 endif
 
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index a747b40..8f831ae 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -62,9 +62,7 @@ endif
 
 
 ### Pixel depths
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_ALL),y)
-QT_PIXEL_DEPTHS = all
-else
+QT_PIXEL_DEPTHS := # empty
 ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_1),y)
 QT_PIXEL_DEPTHS += 1
 endif
@@ -92,7 +90,6 @@ endif
 ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_32),y)
 QT_PIXEL_DEPTHS += 32
 endif
-endif
 ifneq ($(QT_PIXEL_DEPTHS),)
 QT_CONFIGURE += -depths $(subst $(space),$(comma),$(strip $(QT_PIXEL_DEPTHS)))
 endif
-- 
1.6.3.3

[Buildroot] [PATCH 18/23] qt: remove Kconfig option to enable all pixel depths

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:41 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> The Kconfig menu "Pixel depths" of Qt provides a list with all
> selectable pixel depths and additionally the option "all".
> 
> When "all" is selected, the list with all available pixel depths
> disappears.
> 
> Because this disappearing of available pixel depths makes no sense
> under usability aspects, simply remove the option "all".
> 
> The user could enable all available pixel depths by selecting each
> individual depth anyway. So no functionality is lost.
> 
> Signed-off-by: Michael Roth <mroth@nessie.de>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 18/23] qt: remove Kconfig option to enable all pixel depths

[Peter Korsgaard]

>>>>> "Michael" == Michael Roth <mroth@nessie.de> writes:

 Michael> The Kconfig menu "Pixel depths" of Qt provides a list with all
 Michael> selectable pixel depths and additionally the option "all".

 Michael> When "all" is selected, the list with all available pixel depths
 Michael> disappears.

 Michael> Because this disappearing of available pixel depths makes no sense
 Michael> under usability aspects, simply remove the option "all".

 Michael> The user could enable all available pixel depths by selecting each
 Michael> individual depth anyway. So no functionality is lost.

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 19/23] qt: remove commercial license option

[Michael Roth]

It looks like that nobody is using the commercial license option
because the code is broken (BR2_QT_COMMERCIAL_PASSWORD typo) and
dist.trolltech.com became silent long ago and nobody complained about.

So remove the broken and unused stuff.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 configs/atstk100x_defconfig |    1 -
 configs/v100sc2_defconfig   |    2 --
 package/qt/Config.in        |   18 ------------------
 package/qt/qt.mk            |   20 ++++----------------
 4 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index 9207895..32de940 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -690,7 +690,6 @@ BR2_PACKAGE_QT=y
 # BR2_PACKAGE_QT_DEBUG is not set
 BR2_PACKAGE_QT_SHARED=y
 # BR2_PACKAGE_QT_STATIC is not set
-# BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL is not set
 # BR2_PACKAGE_QT_LICENSE_APPROVED is not set
 # BR2_PACKAGE_QT_QT3SUPPORT is not set
 BR2_PACKAGE_QT_GUI_MODULE=y
diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index fcece77..799931b 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -546,8 +546,6 @@ BR2_PACKAGE_QT=y
 # BR2_PACKAGE_QT_DEBUG is not set
 BR2_PACKAGE_QT_SHARED=y
 # BR2_PACKAGE_QT_STATIC is not set
-BR2_PACKAGE_QT_LICENSE_TYPE_GPL=y
-# BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL is not set
 BR2_PACKAGE_QT_GPL_LICENSE_APPROVED=y
 # BR2_PACKAGE_QT_QT3SUPPORT is not set
 BR2_PACKAGE_QT_PIXEL_DEPTH_8=y
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 5ab2dde..01e63ef 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -39,12 +39,8 @@ config BR2_PACKAGE_QT_STATIC
 
 endchoice
 
-config BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL
-	bool "Use commercial license"
-
 config BR2_PACKAGE_QT_LICENSE_APPROVED
 	bool "Approve free license"
-	depends on !BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL
 	help
 	  Select this if you approve one of the available free licenses for the
 	  Qt4 library.
@@ -54,20 +50,6 @@ config BR2_PACKAGE_QT_LICENSE_APPROVED
 	  LGPL v2.1: http://doc.trolltech.com/4.5/lgpl.html
 	  GPL  v3.0: http://doc.trolltech.com/4.5/gpl.html
 
-config BR2_PACKAGE_QT_COMMERCIAL_USERNAME
-	string "Qt 4 Commercial License Username"
-	depends on BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL
-	help
-	  Commercial users can download their source directly by
-	  providing a username.
-
-config BR2_PACKAGE_QT_COMMERCIAL_PASSWORD
-	string "Qt 4 Commercial License Password"
-	depends on BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL
-	help
-	  Commercial users can download their source directly by
-	  providing a password.
-
 config BR2_PACKAGE_QT_QT3SUPPORT
 	bool "Compatibility with Qt3"
 	help
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 8f831ae..d7b0fef 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -13,27 +13,15 @@
 ######################################################################
 
 QT_VERSION:=4.5.2
+QT_SOURCE:=qt-embedded-linux-opensource-src-$(QT_VERSION).tar.bz2
+QT_SITE:=http://get.qtsoftware.com/qt/source
 QT_CAT:=$(BZCAT)
-
-BR2_PACKAGE_QT_COMMERCIAL_USERNAME:=$(call qstrip,$(BR2_PACKAGE_QT_COMMERCIAL_USERNAME))
-BR2_PACKAGE_QT_COMMERCIAL_PASSWORD:=$(call qstrip,$(BR2_PACKAGE_QT_COMMERCIAL_PASSWORD))
+QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_VERSION)
 
 QT_CONFIGURE:=#empty
 
-# What to download, free or commercial version.
-ifneq ($(BR2_PACKAGE_QT_COMMERCIAL_USERNAME),)
-QT_SITE:=http://$(BR2_PACKAGE_QT_COMMERCIAL_USERNAME):$(BR2_QT_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QT_COMMERCIAL_USERNAME)
-QT_SOURCE:=qt-embedded-linux-commercial-src-$(QT_VERSION).tar.bz2
-QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-commercial-src-$(QT_VERSION)
-QT_CONFIGURE+= -commercial
-else # Good, good, we are free:
-QT_SITE=http://get.qtsoftware.com/qt/source
-QT_SOURCE:=qt-embedded-linux-opensource-src-$(QT_VERSION).tar.bz2
-QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_VERSION)
-QT_CONFIGURE+= -opensource
 ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
-QT_CONFIGURE+= -confirm-license
-endif
+QT_CONFIGURE += -opensource -confirm-license
 endif
 
 # If you want extra tweaking you can copy
-- 
1.6.3.3

[Buildroot] [PATCH 19/23] qt: remove commercial license option

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:42 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> It looks like that nobody is using the commercial license option
> because the code is broken (BR2_QT_COMMERCIAL_PASSWORD typo) and
> dist.trolltech.com became silent long ago and nobody complained about.
> 
> So remove the broken and unused stuff.
> 
> Signed-off-by: Michael Roth <mroth@nessie.de>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 19/23] qt: remove commercial license option

[Peter Korsgaard]

>>>>> "Michael" == Michael Roth <mroth@nessie.de> writes:

 Michael> It looks like that nobody is using the commercial license option
 Michael> because the code is broken (BR2_QT_COMMERCIAL_PASSWORD typo) and
 Michael> dist.trolltech.com became silent long ago and nobody complained about.

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 20/23] qt: simplify and fix installing qt in the target

[Michael Roth]

Get rid of unnecessary complex constructs to install Qt in the target
file system. This also fixes the installation procedure when Qt is
build static.

Additionally wipe out old Qt files from the staging area and target
file system before installing the new ones to prevent messiness.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |  123 ++++++++++++++----------------------------------------
 1 files changed, 32 insertions(+), 91 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index d7b0fef..3784dea 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -313,37 +313,37 @@ endif
 
 BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
 
-# Figure out what libs to install in the target
-QT_LIBS=#empty
+# Figure out what shared libs to install in the target
+QT_LIBS := libQtCore.so
 ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-QT_LIBS+= qt-gui  
+QT_LIBS += libQtGui.so
 endif
 ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
-QT_LIBS+= qt-sql
+QT_LIBS += libQtSql.so
 endif
 ifeq ($(BR2_PACKAGE_QT_PHONON),y)
-QT_LIBS+= qt-phonon
+QT_LIBS += libphonon.so
 endif
 ifeq ($(BR2_PACKAGE_QT_SVG),y)
-QT_LIBS+= qt-svg
+QT_LIBS += libQtSvg.so
 endif
 ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
-QT_LIBS+= qt-network
+QT_LIBS += libQtNetwork.so
 endif
 ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
-QT_LIBS+= qt-webkit
+QT_LIBS += libQtWebKit.so
 endif
 ifeq ($(BR2_PACKAGE_QT_XML),y)
-QT_LIBS+= qt-xml
+QT_LIBS += libQtXml.so
 endif
 ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
-QT_LIBS+= qt-xmlpatterns
+QT_LIBS += libQtXmlPatterns.so
 endif
 ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
-QT_LIBS+= qt-script
+QT_LIBS += libQtScript.so
 endif
 ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
-QT_LIBS+= qt-scripttools
+QT_LIBS += libQtScriptTools.so
 endif
 
 QT_UNSTAGE_FILES := $(QT_TARGET_DIR)/.staged		\
@@ -380,23 +380,6 @@ define QT_QMAKE_SET
 	@$(SED) '/include.*qws.conf/aQMAKE_$(1) = $(2)' $(QT_QMAKE_CONF)
 endef
 
-################################################################################
-# QT_INSTALL_PLUGINS -- helper macro to install Qt plugins to target and 
-# strip them
-#
-# Argument 1 is the plugin folder
-# 
-# E.G. use like this to install plugins/sqldrivers:
-# $(call QT_INSTALL_PLUGINS,sqldrivers)
-# ################################################################################
-define QT_INSTALL_PLUGINS
-        if [ -d $(STAGING_DIR)/usr/plugins/$(1) ]; then \
-                mkdir -p $(TARGET_DIR)/usr/plugins; \
-                cp -dpfr $(STAGING_DIR)/usr/plugins/$(1) $(TARGET_DIR)/usr/plugins/; \
-                $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/$(1)/*; \
-        fi
-endef
-
 $(DL_DIR)/$(QT_SOURCE):
 	$(call DOWNLOAD,$(QT_SITE),$(QT_SOURCE))
 
@@ -460,78 +443,34 @@ $(QT_TARGET_DIR)/.compiled: $(QT_TARGET_DIR)/.configured
 	$(MAKE) -C $(QT_TARGET_DIR)
 	touch $@
 
-$(STAGING_DIR)/usr/lib/libQtCore.la: $(QT_TARGET_DIR)/.compiled
+$(QT_TARGET_DIR)/.staged: $(QT_TARGET_DIR)/.compiled
+	-rm -rf $(QT_UNSTAGE_FILES)
 	$(MAKE) -C $(QT_TARGET_DIR) install
+	touch $@
 
-qt-gui: $(STAGING_DIR)/usr/lib/libQtCore.la
+$(QT_TARGET_DIR)/.installed: $(QT_TARGET_DIR)/.staged
+	-rm -rf $(QT_UNINSTALL_FILES)
+ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
 	mkdir -p $(TARGET_DIR)/usr/lib/fonts
 	cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.qpf $(TARGET_DIR)/usr/lib/fonts
 ifneq ($(BR2_PACKAGE_QT_NOFREETYPE),y)
 	cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
 endif
-	# Install image plugins if they are built
-	$(call QT_INSTALL_PLUGINS,imageformats)
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtGui.so.* $(TARGET_DIR)/usr/lib/
-endif
-
-qt-sql: $(STAGING_DIR)/usr/lib/libQtCore.la
-	$(call QT_INSTALL_PLUGINS,sqldrivers)
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtSql.so.* $(TARGET_DIR)/usr/lib/
-endif
-
-qt-phonon: $(STAGING_DIR)/usr/lib/libQtCore.la
-	$(call QT_INSTALL_PLUGINS,phonon_backend)
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libphonon.so.* $(TARGET_DIR)/usr/lib/
-endif
-
-qt-svg: $(STAGING_DIR)/usr/lib/libQtCore.la
-	$(call QT_INSTALL_PLUGINS,iconengines)
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtSvg.so.* $(TARGET_DIR)/usr/lib/
-endif
-
-qt-network: $(STAGING_DIR)/usr/lib/libQtCore.la
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtNetwork.so.* $(TARGET_DIR)/usr/lib/
 endif
-
-qt-webkit: $(STAGING_DIR)/usr/lib/libQtCore.la
 ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtWebKit.so.* $(TARGET_DIR)/usr/lib/
-endif
-
-qt-xml: $(STAGING_DIR)/usr/lib/libQtCore.la
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtXml.so.* $(TARGET_DIR)/usr/lib/
-endif
-
-qt-xmlpatterns: $(STAGING_DIR)/usr/lib/libQtCore.la
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtXmlPatterns.so.* $(TARGET_DIR)/usr/lib/
-endif
-
-qt-script: $(STAGING_DIR)/usr/lib/libQtCore.la
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtScript.so.* $(TARGET_DIR)/usr/lib/
-endif
-
-qt-scripttools: $(STAGING_DIR)/usr/lib/libQtCore.la
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
-endif
-
-
-$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
-	# Strip all installed libs
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-	cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.*
-endif
+	for lib in $(QT_LIBS); do \
+		cp -dpf $(STAGING_DIR)/usr/lib/$${lib}* $(TARGET_DIR)/usr/lib/; \
+		$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$${lib}.$(QT_VERSION); \
+	done
+endif
+	if [ -d $(STAGING_DIR)/usr/plugins ]; then \
+		mkdir -p $(TARGET_DIR)/usr/plugins; \
+		cp -dpfr $(STAGING_DIR)/usr/plugins/* $(TARGET_DIR)/usr/plugins/; \
+		$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/*/*; \
+	fi
+	touch $@
 
-qt: $(QT_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4
+qt-install: $(QT_DEP_LIBS) $(QT_TARGET_DIR)/.installed
 
 qt-uninstall:
 	-rm -rf $(QT_UNSTAGE_FILES) $(QT_UNINSTALL_FILES)
@@ -547,6 +486,8 @@ qt-confclean:
 qt-dirclean:
 	rm -rf $(QT_TARGET_DIR)
 
+qt: qt-install
+
 #############################################################
 #
 # Toplevel Makefile options
-- 
1.6.3.3

[Buildroot] [PATCH 20/23] qt: simplify and fix installing qt in the target

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:43 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> Get rid of unnecessary complex constructs to install Qt in the target
> file system. This also fixes the installation procedure when Qt is
> build static.
> 
> Additionally wipe out old Qt files from the staging area and target
> file system before installing the new ones to prevent messiness.

Ok, but two remarks:

 1. I'm a little bit confused by the .staged/.installed naming.
    Instead, could we use a naming closer to the one used in
    Makefile.autotools.in, which could be: .staging_installed
    and .target_installed ?

 2. The installation of the libraries to the target/ directory will
    include the unnecessary libQt*.so symbolic link (only libQt*.so.X
    symbolic links + the library itself are really needed for the
    runtime)

Sincerly,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 20/23] qt: simplify and fix installing qt in the target

[Thiago A. Corrêa]

Hi,

On Wed, Oct 7, 2009 at 8:14 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Le Wed, ?7 Oct 2009 11:20:43 +0200,
> Michael Roth <mroth@nessie.de> a ?crit :
>
> Ok, but two remarks:
>
> ?2. The installation of the libraries to the target/ directory will
> ? ?include the unnecessary libQt*.so symbolic link (only libQt*.so.X
> ? ?symbolic links + the library itself are really needed for the
> ? ?runtime)
>

Also, you seems to drop the BR2_PACKAGE_QT_SHARED checks. If the
library is built static, those files won't exist. The whole for could
be skiped. Also plugins install could be skipped, as Qt won't allow
for shared library plugins when the library itself is static.

Kind Regards,
    Thiago A. Correa

[Buildroot] [PATCH 21/23] qt: add a Kconfig menu entry to enable an optional custom qconfig.h

[Michael Roth]

Don't twiddle with Makfiles, use Kconfig instead.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/Config.in |   12 ++++++++++++
 package/qt/qt.mk     |   24 +++++++++---------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 01e63ef..859f1c8 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -324,4 +324,16 @@ config BR2_PACKAGE_QT_SCRIPTTOOLS
 	  Build the Qt Script Tools module.
 	  if unsure, say n.
 
+config BR2_PACKAGE_QT_QCONFIG_FILE
+	string "Optional qconfig.h"
+	help
+	  Optional path to a qconfig.h file for fine-grained Qt
+	  customization.
+
+	  This file is copied to the appropriate destination in the Qt
+	  source tree and an appropriate option is passed to configure.
+	  No further intervention is necessary.
+
+	  If unsure, leave empty.
+
 endif # BR2_PACKAGE_QT
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 3784dea..deb303e 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -18,23 +18,17 @@ QT_SITE:=http://get.qtsoftware.com/qt/source
 QT_CAT:=$(BZCAT)
 QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_VERSION)
 
+QT_QCONFIG_FILE:=$(call qstrip,$(BR2_PACKAGE_QT_QCONFIG_FILE))
+
 QT_CONFIGURE:=#empty
 
 ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
 QT_CONFIGURE += -opensource -confirm-license
 endif
 
-# If you want extra tweaking you can copy
-# $(QT_TARGET_DIR)/src/corelib/global/qconfig-myfile.h
-# to the qt packages directory (where this .mk file is) and
-# remove the comment.
-# QT_QCONFIG_COMMAND:=-qconfig myfile
-#
-# For the options you can set in this file, look at
-# $(QT_TARGET_DIR)/src/corelib/global/qfeatures.txt
-#
-QT_QCONFIG_FILE:=package/qt/qconfig-myfile.h
-QT_QCONFIG_FILE_LOCATION:=/src/corelib/global/
+ifneq ($(QT_QCONFIG_FILE),)
+QT_CONFIGURE += -qconfig local
+endif
 
 ifeq ($(BR2_LARGEFILE),y)
 QT_CONFIGURE+= -largefile
@@ -393,7 +387,7 @@ $(QT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QT_SOURCE)
 		qt-$(QT_VERSION)-\*.patch.$(ARCH)
 	touch $@
 
-$(QT_TARGET_DIR)/.configured: $(QT_TARGET_DIR)/.unpacked
+$(QT_TARGET_DIR)/.configured: $(QT_TARGET_DIR)/.unpacked $(QT_QCONFIG_FILE)
 	-[ -f $(QT_TARGET_DIR)/Makefile ] && $(MAKE) -C $(QT_TARGET_DIR) confclean
 ifneq ($(BR2_INET_IPV6),y)
 	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QT_TARGET_DIR)/configure
@@ -411,8 +405,9 @@ endif
 	$(call QT_QMAKE_SET,CFLAGS,$(TARGET_CFLAGS))
 	$(call QT_QMAKE_SET,CXXFLAGS,$(TARGET_CXXFLAGS))
 	$(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS))
-	-[ -f $(QT_QCONFIG_FILE) ] && cp $(QT_QCONFIG_FILE) \
-		$(QT_TARGET_DIR)/$(QT_QCONFIG_FILE_LOCATION)
+ifneq ($(QT_QCONFIG_FILE),)
+	cp -pf $(QT_QCONFIG_FILE) $(QT_TARGET_DIR)/src/corelib/global/qconfig-local.h
+endif
 # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
 # instead of the host then. So set PKG_CONFIG* manually.
 	(cd $(QT_TARGET_DIR); \
@@ -423,7 +418,6 @@ endif
 		$(if $(QUIET),-silent,-verbose) \
 		-force-pkg-config \
 		-embedded $(BR2_PACKAGE_QT_EMB_PLATFORM) \
-		$(QT_QCONFIG_COMMAND) \
 		$(QT_CONFIGURE) \
 		-no-xinerama \
 		-no-cups \
-- 
1.6.3.3

[Buildroot] [PATCH 21/23] qt: add a Kconfig menu entry to enable an optional custom qconfig.h

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:44 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> Don't twiddle with Makfiles, use Kconfig instead.

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

To be complete, we should probably provide a way to *generate* such a
configuration file. Qt includes a tool, called qconfig if I remember
correctly, and that allows to graphically generates this configuration.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 22/23] qt: group qstrip macro calls together

[Michael Roth]

For the sake of beauty group the calls to qstrip together and assign
the result to new variables.

Additionally while we are here remove some excessive newlines.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index deb303e..dbb1fae 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -18,6 +18,7 @@ QT_SITE:=http://get.qtsoftware.com/qt/source
 QT_CAT:=$(BZCAT)
 QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_VERSION)
 
+QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
 QT_QCONFIG_FILE:=$(call qstrip,$(BR2_PACKAGE_QT_QCONFIG_FILE))
 
 QT_CONFIGURE:=#empty
@@ -42,7 +43,6 @@ else
 QT_CONFIGURE+= -no-qt3support
 endif
 
-
 ### Pixel depths
 QT_PIXEL_DEPTHS := # empty
 ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_1),y)
@@ -213,7 +213,6 @@ QT_CONFIGURE+= -no-libtiff
 endif
 endif
 
-
 ifeq ($(BR2_PACKAGE_QT_QTFREETYPE),y)
 QT_CONFIGURE+= -qt-freetype
 else
@@ -226,7 +225,6 @@ QT_CONFIGURE+= -no-freetype
 endif
 endif
 
-
 ifeq ($(BR2_PACKAGE_QT_OPENSSL),y)
 QT_CONFIGURE+= -openssl
 QT_DEP_LIBS+=openssl
@@ -305,8 +303,6 @@ ifeq ($(BR2_CCACHE),y)
 QT_CONFIGURE += -no-pch
 endif
 
-BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
-
 # Figure out what shared libs to install in the target
 QT_LIBS := libQtCore.so
 ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
@@ -356,7 +352,7 @@ QT_UNINSTALL_FILES := $(QT_TARGET_DIR)/.installed	\
 	$(TARGET_DIR)/usr/lib/libQt*			\
 	$(TARGET_DIR)/usr/lib/libphonon.*
 
-QT_QMAKE_CONF:=$(QT_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++/qmake.conf
+QT_QMAKE_CONF:=$(QT_TARGET_DIR)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
 
 ################################################################################
 # QT_QMAKE_SET -- helper macro to set QMAKE_<variable> = <value> in
@@ -379,7 +375,6 @@ $(DL_DIR)/$(QT_SOURCE):
 
 qt-source: $(DL_DIR)/$(QT_SOURCE)
 
-
 $(QT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QT_SOURCE)
 	$(QT_CAT) $(DL_DIR)/$(QT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(QT_TARGET_DIR) package/qt/ \
@@ -417,7 +412,7 @@ endif
 		./configure \
 		$(if $(QUIET),-silent,-verbose) \
 		-force-pkg-config \
-		-embedded $(BR2_PACKAGE_QT_EMB_PLATFORM) \
+		-embedded $(QT_EMB_PLATFORM) \
 		$(QT_CONFIGURE) \
 		-no-xinerama \
 		-no-cups \
-- 
1.6.3.3

[Buildroot] [PATCH 22/23] qt: group qstrip macro calls together

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:45 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> For the sake of beauty group the calls to qstrip together and assign
> the result to new variables.
> 
> Additionally while we are here remove some excessive newlines.
> 
> Signed-off-by: Michael Roth <mroth@nessie.de>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 23/23] qt: rename QT_TARGET_DIR to QT_DIR

[Michael Roth]

QT_TARGET_DIR originate from ancient times when Qt was build for the
target and host separately.

Stick more to the buildroot standard and rename it to QT_DIR.

Signed-off-by: Michael Roth <mroth@nessie.de>
---
 package/qt/qt.mk |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index dbb1fae..6e8fe68 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -16,7 +16,7 @@ QT_VERSION:=4.5.2
 QT_SOURCE:=qt-embedded-linux-opensource-src-$(QT_VERSION).tar.bz2
 QT_SITE:=http://get.qtsoftware.com/qt/source
 QT_CAT:=$(BZCAT)
-QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_VERSION)
+QT_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_VERSION)
 
 QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
 QT_QCONFIG_FILE:=$(call qstrip,$(BR2_PACKAGE_QT_QCONFIG_FILE))
@@ -336,7 +336,7 @@ ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
 QT_LIBS += libQtScriptTools.so
 endif
 
-QT_UNSTAGE_FILES := $(QT_TARGET_DIR)/.staged		\
+QT_UNSTAGE_FILES := $(QT_DIR)/.staged			\
 	$(STAGING_DIR)/usr/lib/fonts			\
 	$(STAGING_DIR)/usr/plugins			\
 	$(STAGING_DIR)/usr/translations			\
@@ -346,13 +346,13 @@ QT_UNSTAGE_FILES := $(QT_TARGET_DIR)/.staged		\
 	$(STAGING_DIR)/usr/lib/libphonon.*		\
 	$(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc
 
-QT_UNINSTALL_FILES := $(QT_TARGET_DIR)/.installed	\
+QT_UNINSTALL_FILES := $(QT_DIR)/.installed		\
 	$(TARGET_DIR)/usr/lib/fonts			\
 	$(TARGET_DIR)/usr/plugins			\
 	$(TARGET_DIR)/usr/lib/libQt*			\
 	$(TARGET_DIR)/usr/lib/libphonon.*
 
-QT_QMAKE_CONF:=$(QT_TARGET_DIR)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
+QT_QMAKE_CONF:=$(QT_DIR)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
 
 ################################################################################
 # QT_QMAKE_SET -- helper macro to set QMAKE_<variable> = <value> in
@@ -375,18 +375,18 @@ $(DL_DIR)/$(QT_SOURCE):
 
 qt-source: $(DL_DIR)/$(QT_SOURCE)
 
-$(QT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QT_SOURCE)
+$(QT_DIR)/.unpacked: $(DL_DIR)/$(QT_SOURCE)
 	$(QT_CAT) $(DL_DIR)/$(QT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(QT_TARGET_DIR) package/qt/ \
+	toolchain/patch-kernel.sh $(QT_DIR) package/qt/ \
 		qt-$(QT_VERSION)-\*.patch \
 		qt-$(QT_VERSION)-\*.patch.$(ARCH)
 	touch $@
 
-$(QT_TARGET_DIR)/.configured: $(QT_TARGET_DIR)/.unpacked $(QT_QCONFIG_FILE)
-	-[ -f $(QT_TARGET_DIR)/Makefile ] && $(MAKE) -C $(QT_TARGET_DIR) confclean
+$(QT_DIR)/.configured: $(QT_DIR)/.unpacked $(QT_QCONFIG_FILE)
+	-[ -f $(QT_DIR)/Makefile ] && $(MAKE) -C $(QT_DIR) confclean
 ifneq ($(BR2_INET_IPV6),y)
-	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QT_TARGET_DIR)/configure
-	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QT_TARGET_DIR)/configure
+	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QT_DIR)/configure
+	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QT_DIR)/configure
 endif
 	# Fix compiler path
 	$(call QT_QMAKE_SET,CC,$(TARGET_CC))
@@ -401,11 +401,11 @@ endif
 	$(call QT_QMAKE_SET,CXXFLAGS,$(TARGET_CXXFLAGS))
 	$(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS))
 ifneq ($(QT_QCONFIG_FILE),)
-	cp -pf $(QT_QCONFIG_FILE) $(QT_TARGET_DIR)/src/corelib/global/qconfig-local.h
+	cp -pf $(QT_QCONFIG_FILE) $(QT_DIR)/src/corelib/global/qconfig-local.h
 endif
 # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
 # instead of the host then. So set PKG_CONFIG* manually.
-	(cd $(QT_TARGET_DIR); \
+	(cd $(QT_DIR); \
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
@@ -428,16 +428,16 @@ endif
 	)
 	touch $@
 
-$(QT_TARGET_DIR)/.compiled: $(QT_TARGET_DIR)/.configured
-	$(MAKE) -C $(QT_TARGET_DIR)
+$(QT_DIR)/.compiled: $(QT_DIR)/.configured
+	$(MAKE) -C $(QT_DIR)
 	touch $@
 
-$(QT_TARGET_DIR)/.staged: $(QT_TARGET_DIR)/.compiled
+$(QT_DIR)/.staged: $(QT_DIR)/.compiled
 	-rm -rf $(QT_UNSTAGE_FILES)
-	$(MAKE) -C $(QT_TARGET_DIR) install
+	$(MAKE) -C $(QT_DIR) install
 	touch $@
 
-$(QT_TARGET_DIR)/.installed: $(QT_TARGET_DIR)/.staged
+$(QT_DIR)/.installed: $(QT_DIR)/.staged
 	-rm -rf $(QT_UNINSTALL_FILES)
 ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
 	mkdir -p $(TARGET_DIR)/usr/lib/fonts
@@ -459,21 +459,21 @@ endif
 	fi
 	touch $@
 
-qt-install: $(QT_DEP_LIBS) $(QT_TARGET_DIR)/.installed
+qt-install: $(QT_DEP_LIBS) $(QT_DIR)/.installed
 
 qt-uninstall:
 	-rm -rf $(QT_UNSTAGE_FILES) $(QT_UNINSTALL_FILES)
 
 qt-clean:
-	-$(MAKE) -C $(QT_TARGET_DIR) clean
-	-rm -f $(QT_TARGET_DIR)/.compiled
+	-$(MAKE) -C $(QT_DIR) clean
+	-rm -f $(QT_DIR)/.compiled
 
 qt-confclean:
-	-$(MAKE) -C $(QT_TARGET_DIR) confclean
-	-rm -f $(QT_TARGET_DIR)/.configured
+	-$(MAKE) -C $(QT_DIR) confclean
+	-rm -f $(QT_DIR)/.configured
 
 qt-dirclean:
-	rm -rf $(QT_TARGET_DIR)
+	rm -rf $(QT_DIR)
 
 qt: qt-install
 
-- 
1.6.3.3

[Buildroot] [PATCH 23/23] qt: rename QT_TARGET_DIR to QT_DIR

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:46 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> QT_TARGET_DIR originate from ancient times when Qt was build for the
> target and host separately.
> 
> Stick more to the buildroot standard and rename it to QT_DIR.
> 
> Signed-off-by: Michael Roth <mroth@nessie.de>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [Patch 0/23] Cleanups for Qt

[Thomas Petazzoni]

Le Wed,  7 Oct 2009 11:20:23 +0200,
Michael Roth <mroth@nessie.de> a ?crit :

> I assembled some cleanups for Qt. Mostly they are small changes
> except twos, namely:

Thanks a lot for this cleanup work on Qt, much appreciated. All the
changes are nicely split into individual patches, making the review a
fast and easy process.

Thanks!

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com