This project is archived. Its data is read-only.

Commit 195235c9 authored Jan 06, 2014 by Julien Boibessot Committed by Peter Korsgaard Jan 09, 2014

qt4: allow separate build/installation of demos and examples



Signed-off-by: Jeremie Scheer <jeremie.scheer@armadeus.com>
Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

parent 49cfa71e

package/qt/Config.in

+7 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,13 @@ config BR2_PACKAGE_QT_DEBUG
		If unsure, say N.

		config BR2_PACKAGE_QT_DEMOS
		bool "Compile and install demos and examples (with code)"
		bool "Compile and install Qt demos (with code)"
		select BR2_PACKAGE_QT_GUI_MODULE
		help
		If unsure, say N.

		config BR2_PACKAGE_QT_EXAMPLES
		bool "Compile and install Qt examples (with code)"
		select BR2_PACKAGE_QT_GUI_MODULE
		help
		If unsure, say N.

package/qt/qt.mk

+7 −2

Original line number	Diff line number	Diff line
		@@ -59,9 +59,14 @@ QT_CONFIGURE_OPTS += -no-qt3support
		endif

		ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
		QT_CONFIGURE_OPTS += -examplesdir $(TARGET_DIR)/usr/share/qt/examples -demosdir $(TARGET_DIR)/usr/share/qt/demos
		QT_CONFIGURE_OPTS += -demosdir $(TARGET_DIR)/usr/share/qt/demos
		else
		QT_CONFIGURE_OPTS += -nomake examples -nomake demos
		QT_CONFIGURE_OPTS += -nomake demos
		endif
		ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
		QT_CONFIGURE_OPTS += -examplesdir $(TARGET_DIR)/usr/share/qt/examples
		else
		QT_CONFIGURE_OPTS += -nomake examples
		endif

		# ensure glib is built first if enabled for Qt's glib support