Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48485949 authored by Yaakov Selkowitz's avatar Yaakov Selkowitz Committed by Michal Marek
Browse files

xconfig: use pkgconfig to find moc 



Various schemes exist to allow parallel installations of multiple major
versions of Qt (4.x with the previous 3.x and/or the upcoming 5.x).
QtCore.pc includes a moc_location variable which should be a more reliable
way to find moc.

Signed-off-by: default avatarYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 3725f3ed

scripts/kconfig/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -260,8 +260,8 @@ $(obj)/.tmp_qtcheck: 
	else \

	  cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \

	  libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \

	  binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \

	  moc="$$binpath/bin/moc"; \

	  moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \

	  [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \

	fi; \

	echo "KC_QT_CFLAGS=$$cflags" > $@; \

	echo "KC_QT_LIBS=$$libs" >> $@; \