diff options
Diffstat (limited to 'package/qt')
| -rw-r--r-- | package/qt/qt.mk | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 4b6876ff0..78b2eec3a 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -48,6 +48,11 @@ else QT_CONFIGURE+= -no-qt3support endif +# ensure glib is built first if enabled for Qt's glib support +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +QT_DEP_LIBS+=libglib2 +endif + ### Pixel depths QT_PIXEL_DEPTHS := # empty @@ -347,6 +352,16 @@ endif 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)),) +ifneq ($(findstring x86,$(BR2_PACKAGE_QT_EMB_PLATFORM)),) +QT_CONFIGURE+= -platform linux-g++ +endif +endif +# End of workaround. + # Figure out what libs to install in the target QT_LIBS=#empty ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y) |