File ghpsdr3-alex-qmake-qt5.diff of Package ghpsdr3-alex

Overview Repositories Revisions Requests Users Attributes Meta

File ghpsdr3-alex-qmake-qt5.diff of Package ghpsdr3-alex (Revision b601ca35f3da98d8215835f0bc68e005)

Currently displaying revision b601ca35f3da98d8215835f0bc68e005 , Show latest

diff --git a/trunk/src/QtRadio/build-aux/autotroll.m4 b/trunk/src/QtRadio/build-aux/autotroll.m4
index 52ec84b..80121e3 100644
--- a/trunk/src/QtRadio/build-aux/autotroll.m4
+++ b/trunk/src/QtRadio/build-aux/autotroll.m4
@@ -156,7 +156,7 @@ dnl Memo: AC_ARG_WITH(package, help-string, [if-given], [if-not-given])
 
   # Find qmake.
   AC_ARG_VAR([QMAKE], [Qt Makefile generator command])
-  AC_PATH_PROGS([QMAKE], [qmake qmake-qt4 qmake], [missing],
+  AC_PATH_PROGS([QMAKE], [qmake qmake-qt5 qmake], [missing],
                 [$QT_DIR:$QT_PATH:$PATH:$tmp_qt_paths])
   if test x"$QMAKE" = xmissing; then
     AX_INSTEAD_IF([$4], [Cannot find qmake in your PATH. Try using --with-qt.])
@@ -165,7 +165,7 @@ dnl Memo: AC_ARG_WITH(package, help-string, [if-given], [if-not-given])
 
   # Find moc (Meta Object Compiler).
   AC_ARG_VAR([MOC], [Qt Meta Object Compiler command])
-  AC_PATH_PROGS([MOC], [moc moc-qt4 moc], [missing],
+  AC_PATH_PROGS([MOC], [moc moc-qt5 moc], [missing],
                 [$QT_PATH:$PATH:$tmp_qt_paths])
   if test x"$MOC" = xmissing; then
     AX_INSTEAD_IF([$4],
@@ -175,7 +175,7 @@ dnl Memo: AC_ARG_WITH(package, help-string, [if-given], [if-not-given])
 
   # Find uic (User Interface Compiler).
   AC_ARG_VAR([UIC], [Qt User Interface Compiler command])
-  AC_PATH_PROGS([UIC], [uic uic-qt4 uic], [missing],
+  AC_PATH_PROGS([UIC], [uic uic-qt5 uic], [missing],
                 [$QT_PATH:$PATH:$tmp_qt_paths])
   if test x"$UIC" = xmissing; then
     AX_INSTEAD_IF([$4],

Places

File ghpsdr3-alex-qmake-qt5.diff of Package ghpsdr3-alex (Revision b601ca35f3da98d8215835f0bc68e005)

Places