diff options
| author | Alexander Stein <alexander.stein@informatik.tu-chemnitz.de> | 2010-09-10 17:01:14 (GMT) |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-09-13 11:01:30 (GMT) |
| commit | 20f4ad8a19ad01405f9d6b3110d6eb93666ae21e (patch) | |
| tree | 9bc8e816bc3e35f13059cdb3dc0298770e4bd628 /scripts/kconfig/Makefile | |
| parent | aee08ed499d65f78373b716fcacefcde1ceb7ade (diff) | |
| download | linux-20f4ad8a19ad01405f9d6b3110d6eb93666ae21e.tar.xz | |
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: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig/Makefile')
| -rw-r--r-- | scripts/kconfig/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index cef3f75..996059e 100644 --- a/scripts/kconfig/Makefile +++ b/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" >> $@; \ |