Search
SailfishOS Open Build Service
>
Projects
>
home:kaltsi
:
tnhlbug
>
qt
> 0030-qt-accelerate-qmake.patch
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File 0030-qt-accelerate-qmake.patch of Package qt
diff -Naur qt.old/configure qt/configure --- qt.old/configure 2012-09-07 12:29:58.000000000 +0000 +++ qt/configure 2013-04-03 16:08:46.546530900 +0000 @@ -9014,13 +9014,23 @@ # build makefiles based on the configuration #------------------------------------------------------------------------------- +# select the qmake used during qt build +QMAKE="$outpath/bin/qmake" +if [ ! -z "$ACCELERATE_QT_BUILD" ]; then +# exec qmake to test if it exists (for scratchbox2 mapping magic) + /usr/lib/qt4/bin/qmake -v >/dev/null 2>&1 + if [ $? -eq 0 ]; then + QMAKE=/usr/lib/qt4/bin/qmake + fi +fi + echo "Finding project files. Please wait..." if [ "$CFG_NOPROCESS" != "yes" ]; then - "$outpath/bin/qmake" -prl -r "${relpath}/projects.pro" + "$QMAKE" -prl -r "${relpath}/projects.pro" if [ -f "${relpath}/projects.pro" ]; then mkfile="${outpath}/Makefile" [ -f "$mkfile" ] && chmod +w "$mkfile" - QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" + QTDIR="$outpath" "$QMAKE" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" fi fi @@ -9207,7 +9217,6 @@ QMAKE_SPEC_ARGS="-spec $SPEC" echo $ECHO_N " for $a$ECHO_C" - QMAKE="$outpath/bin/qmake" QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS" if [ "$file" = ".projects.3" ]; then echo " (fast)"