提交 20f4ad8a 编写于 作者: A Alexander Stein 提交者: Michal Marek

Fix QT4 moc, cflags libs detection on dual QT3/Qt4 systems

On system with QT3 and QT4 qmake in PATH may be from QT3. So we use
pkg-config for proper QT4 detection.
By reqesting cflags and libs for either QtCore, QtGui and QtSupport include
dirs and libs get listed several times, but so we won't mis anything
Signed-off-by: NAlexander Stein <alexander.stein@informatik.tu-chemnitz.de>
Acked-by: NRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: NMichal Marek <mmarek@suse.cz>
上级 aee08ed4
...@@ -273,12 +273,10 @@ $(obj)/.tmp_qtcheck: ...@@ -273,12 +273,10 @@ $(obj)/.tmp_qtcheck:
moc="/usr/bin/moc"; \ moc="/usr/bin/moc"; \
fi; \ fi; \
else \ else \
headerpath="\$$(shell qmake -query QT_INSTALL_HEADERS)"; \ cflags="\$$(shell pkg-config QtCore --cflags) \$$(shell pkg-config QtGui --cflags) \$$(shell pkg-config Qt3Support --cflags)"; \
libpath="\$$(shell qmake -query QT_INSTALL_LIBS)"; \ libs="\$$(shell pkg-config QtCore --libs) \$$(shell pkg-config QtGui --libs) \$$(shell pkg-config Qt3Support --libs)"; \
binpath="\$$(shell qmake -query QT_INSTALL_BINS)"; \ binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \
cflags="-I$$headerpath -I$$headerpath/QtCore -I$$headerpath/QtGui -I$$headerpath/Qt3Support -DQT3_SUPPORT"; \ moc="$$binpath/bin/moc"; \
libs="-L$$libpath -Wl,-rpath,$$libpath -lQtCore -lQtGui -lQt3Support"; \
moc="$$binpath/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.
先完成此消息的编辑!
想要评论请 注册