aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-02-03 21:39:11 +0000
committerGuy Harris <guy@alum.mit.edu>2013-02-03 21:39:11 +0000
commit02da11d6451fc7ba9fa7cdeb0fe4c341a8a9ccb5 (patch)
tree3db3ed4ca1d2d48bd19057407ed0ce673bd92d45 /ui
parentb85efceddc52eaffd219702f97b8c23755baabf3 (diff)
Sigh. At least on my Fedora 16 with KDE, the Qt 4 versions of uic and
moc are called uic-qt4 and moc-qt4. Look for them by names, plural. svn path=/trunk/; revision=47457
Diffstat (limited to 'ui')
-rw-r--r--ui/qt/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index 6ab2094d14..66fe243493 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -71,17 +71,17 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBG
SUFFIXES = .moc.cpp .qrc .rcc.cpp
.h.moc.cpp:
- moc -I.. -I../.. -o $@ $<
+ $(MOC) -I.. -I../.. -o $@ $<
.qrc.rcc.cpp:
rcc -name `basename $< .qrc` -o $@ $<
ui_%.h: %.ui
- uic $< -o $@
+ $(UIC) $< -o $@
# The Qt toolchain uses the naming convention moc_FOO.cpp. Should we do the same?
#moc_%.cpp: %.h
-# moc $< -o $@
+# $(MOC) $< -o $@
capture_preferences_frame.cpp capture_preferences_frame.h: ui_capture_preferences_frame.h