Commit f9e20886 authored by Michael Roth's avatar Michael Roth Committed by Peter Korsgaard
Browse files

qt: use configure option instead a sed hack to disable xinerama 



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: default avatarMichael Roth <mroth@nessie.de>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent ac5d17bf

package/qt/qt.mk

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,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))
@@ -433,6 +432,7 @@ endif 
		-embedded $(BR2_PACKAGE_QT_EMB_PLATFORM) \

		$(QT_QCONFIG_COMMAND) \

		$(QT_CONFIGURE) \

		-no-xinerama \

		-no-cups \

		-no-nis \

		-no-accessibility \