diff options
| author | Evan Huus <eapache@gmail.com> | 2013-07-15 23:47:11 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-07-15 23:47:11 +0000 |
| commit | 66f7521a172b24dd701149221ea429b7ea518724 (patch) | |
| tree | 6e6051859a1393f2c0df8f8540b61dc1a4f9d0b6 | |
| parent | 54ee8a0f9a6bab535a8583aa60663e152a4a91bc (diff) | |
| download | wireshark-66f7521a172b24dd701149221ea429b7ea518724.tar.gz | |
Revert r50150. I suspect the problem was Ubuntu's transition to qt5 as default,
since now the defaults work as they should.
svn path=/trunk/; revision=50644
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index deaad120d9..b516dec328 100644 --- a/configure.ac +++ b/configure.ac @@ -1390,10 +1390,10 @@ fi # installed; if they're still doing that in current Fedora releases, # perhaps there will also be XXX-qt5 when they pick up Qt 5. # -AC_PATH_PROG(UIC, uic-qt4) +AC_PATH_PROG(UIC, uic) if test "x$UIC" = x then - AC_PATH_PROG(UIC, uic) + AC_PATH_PROG(UIC, uic-qt4) if test "x$UIC" = x then if test "x$with_qt" = "xyes"; then @@ -1416,10 +1416,10 @@ then fi fi AC_SUBST(UIC) -AC_PATH_PROG(MOC, moc-qt4) +AC_PATH_PROG(MOC, moc) if test "x$MOC" = x then - AC_PATH_PROG(MOC, moc) + AC_PATH_PROG(MOC, moc-qt4) if test "x$MOC" = x then if test "x$with_qt" = "xyes"; then |