From 2314f085a05815d578995ef2b9552549c685a292 Mon Sep 17 00:00:00 2001 From: Alexander Stein Date: Fri, 10 Sep 2010 19:01:14 +0200 Subject: [PATCH] --- yaml --- r: 220654 b: refs/heads/master c: 20f4ad8a19ad01405f9d6b3110d6eb93666ae21e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/scripts/kconfig/Makefile | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 68b8dcef17d5..bc5f3adc61f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aee08ed499d65f78373b716fcacefcde1ceb7ade +refs/heads/master: 20f4ad8a19ad01405f9d6b3110d6eb93666ae21e diff --git a/trunk/scripts/kconfig/Makefile b/trunk/scripts/kconfig/Makefile index cef3f75e1c2b..996059ef1c4d 100644 --- a/trunk/scripts/kconfig/Makefile +++ b/trunk/scripts/kconfig/Makefile @@ -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" >> $@; \