提交 48485949 编写于 作者: Y Yaakov Selkowitz 提交者: Michal Marek

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: NYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: NMichal Marek <mmarek@suse.cz>
上级 3725f3ed
...@@ -260,8 +260,8 @@ $(obj)/.tmp_qtcheck: ...@@ -260,8 +260,8 @@ $(obj)/.tmp_qtcheck:
else \ else \
cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \ cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \
libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \ libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \
binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \ moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \
moc="$$binpath/bin/moc"; \ [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \
fi; \ fi; \
echo "KC_QT_CFLAGS=$$cflags" > $@; \ echo "KC_QT_CFLAGS=$$cflags" > $@; \
echo "KC_QT_LIBS=$$libs" >> $@; \ echo "KC_QT_LIBS=$$libs" >> $@; \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册