Skip to content

Commit

Permalink
Revert "osx: use qt 4.8.0 built from source if available"
Browse files Browse the repository at this point in the history
This reverts commit 978bb3b.
  • Loading branch information
jjallaire committed Oct 29, 2013
1 parent 978bb3b commit d26ad68
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions package/osx/make-package
Expand Up @@ -15,11 +15,6 @@ then
cd $PACKAGE_DIR
fi

# use qtsdk built from source if available
if [ -e /usr/local/Trolltech/Qt-4.8.0/bin/qmake ]; then
QMAKE="-DQT_QMAKE_EXECUTABLE=/usr/local/Trolltech/Qt-4.8.0/bin/qmake"
fi

mkdir -p build
cd build
rm -f CMakeCache.txt
Expand All @@ -28,7 +23,7 @@ rm -rf build/_CPack_Packages
cmake -DRSTUDIO_TARGET=Desktop \
-DCMAKE_BUILD_TYPE=Release \
-DRSTUDIO_PACKAGE_BUILD=1 \
${QMAKE} ../../..
../../..

make

Expand Down

0 comments on commit d26ad68

Please sign in to comment.