Fix QT4 moc, cflags libs detection on dual QT3/Qt4 systems (20f4ad8a) · Commits · 戴 / test

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:

Alexander Stein <alexander.stein@informatik.tu-chemnitz.de> Acked-by:

Randy Dunlap <rdunlap@xenotime.net> Signed-off-by:

Michal Marek <mmarek@suse.cz>

scripts/kconfig/Makefile

+4 −6

Original line number	Diff line number	Diff line
		@@ -273,12 +273,10 @@ $(obj)/.tmp_qtcheck:
		moc="/usr/bin/moc"; \
		fi; \
		else \
		headerpath="\$$(shell qmake -query QT_INSTALL_HEADERS)"; \
		libpath="\$$(shell qmake -query QT_INSTALL_LIBS)"; \
		binpath="\$$(shell qmake -query QT_INSTALL_BINS)"; \
		cflags="-I$$headerpath -I$$headerpath/QtCore -I$$headerpath/QtGui -I$$headerpath/Qt3Support -DQT3_SUPPORT"; \
		libs="-L$$libpath -Wl,-rpath,$$libpath -lQtCore -lQtGui -lQt3Support"; \
		moc="$$binpath/moc"; \
		cflags="\$$(shell pkg-config QtCore --cflags) \$$(shell pkg-config QtGui --cflags) \$$(shell pkg-config Qt3Support --cflags)"; \
		libs="\$$(shell pkg-config QtCore --libs) \$$(shell pkg-config QtGui --libs) \$$(shell pkg-config Qt3Support --libs)"; \
		binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \
		moc="$$binpath/bin/moc"; \
		fi; \
		echo "KC_QT_CFLAGS=$$cflags" > $@; \
		echo "KC_QT_LIBS=$$libs" >> $@; \

Admin message