Permalink
Browse files

Bug 745870 - [PATCH] QT4's qmake is titled differently on Fedora 21

Corrected patch for the problem. Here nothing to be copied but multiple possibilities for executables are checked.
  • Loading branch information...
albert-github committed Mar 9, 2015
1 parent e9983f6 commit 3bd3ad9f8f4d010e42f0ba8eeab229f44b1ecb1c
Showing with 20 additions and 10 deletions.
  1. +1 −1 addon/doxywizard/Makefile.in
  2. +19 −9 configure
@@ -10,7 +10,7 @@
# See the GNU General Public License for more details.
#
QMAKE=$(QTDIR)/bin/qmake $(MKSPECS)
QMAKE=$(QTDIR)/bin/$(QMAKEEXE) $(MKSPECS)
INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py
all: Makefile.doxywizard
View
@@ -363,18 +363,27 @@ if test "$f_wizard" = YES; then
echo " QTDIR environment variable not set!"
printf " Checking for Qt..."
for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
if test -x "$d/bin/qmake"; then
QTDIR=$d
break 2
fi
for e in qmake gmake-qt4; do
if test -x "$d/bin/$e"; then
QTDIR=$d
QMAKEEXE=$e
break 2
fi
done
done
else
if test -e "$QTDIR/bin/qmake"; then
printf " Detected Qt via the QTDIR environment variable..."
else
for e in qmake gmake-qt4; do
if test -x "$QTDIR/bin/$e"; then
if test -e "$QTDIR/bin/$e"; then
printf " Detected Qt via the QTDIR environment variable..."
QMAKEEXE=$e
fi
fi
done
if test -z "$QMAKEEXE"; then
printf "ERROR Detected Qt via the QTDIR environment variable..."
echo ", but $QTDIR/bin/qmake does not exist."
echo " Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
echo ", but $QTDIR/bin/qmake or variant does not exist."
echo " Set the QTDIR environment variable such that \$QTDIR/bin/qmake or variant exists."
exit 2
fi
fi
@@ -771,6 +780,7 @@ INSTTOOL = $f_insttool
DOXYDOCS = ..
DOCDIR = $f_docdir
QTDIR = $QTDIR
QMAKEEXE = $QMAKEEXE
EOF
if test "$f_dot" != NO; then

1 comment on commit 3bd3ad9

@dolphindddd

This comment has been minimized.

dolphindddd commented on 3bd3ad9 Mar 10, 2015

I have found a mistake in this commit. gmake-qt4 is searched for instead of qmake-qt4. I submitted a patch in the bug to be put in a future pull request or commit.

Patch is as follows:

--- configure.old 2015-03-09 21:25:16.565788946 -0400
+++ configure.old 2015-03-09 21:26:18.240586161 -0400
@@ -363,7 +363,7 @@
echo " QTDIR environment variable not set!"
printf " Checking for Qt..."
for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do

  •  for e in qmake gmake-qt4; do
    
  •  for e in qmake qmake-qt4; do
     if test -x "$d/bin/$e"; then
       QTDIR=$d
       QMAKEEXE=$e
    
    @@ -372,7 +372,7 @@
    done
    done
    else
  • for e in qmake gmake-qt4; do
  • for e in qmake qmake-qt4; do
    if test -x "$QTDIR/bin/$e"; then
    if test -e "$QTDIR/bin/$e"; then
    printf " Detected Qt via the QTDIR environment variable..."
Please sign in to comment.