Skip to content

Commit

Permalink
Merge pull request #2 from rgabor-szeged/master
Browse files Browse the repository at this point in the history 
Share env with the cross compilation script
  • Loading branch information
@ossy-szeged
ossy-szeged committed Jun 5, 2012
2 parents 05b6a67 + 2833bb6 commit 132adb3
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
2 changes: 2 additions & 0 deletions build-qt5-env
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
QT_WEEKLY_REV=r32
WEEKLY_QT5_HASH="316b2b51e3fc6c47106e467fb0d88a10bcdaf245"
QT5_MODULES="qtjsbackend qtxmlpatterns qtscript qtquick1 qtdeclarative qt3d qtsensors qtlocation"

1 change: 0 additions & 1 deletion build-qt5.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
. ./build-qt5-env
THREADS=-j30
NEW_QTDIR=/usr/local/Trolltech/Qt5/Qt-5.0.0-$QT_WEEKLY_REV
QT5_MODULES="qtjsbackend qtxmlpatterns qtscript qtquick1 qtdeclarative qt3d qtsensors qtlocation"

rm -rf $NEW_QTDIR
cd qt5
Expand Down
1 change: 0 additions & 1 deletion cross-tools/cross-build-qt5.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ then
fi

NEW_QTDIR="$QTDIR_PATH/Qt-5.0.0-$QT_WEEKLY_REV"
QT5_MODULES="qtjsbackend qtxmlpatterns qtscript qtdeclarative qtquick1 qt3d qtsensors qtlocation"

export QTDIR=$NEW_QTDIR
export PATH=$QTDIR/bin:$PATH
Expand Down

0 comments on commit 132adb3

Please sign in to comment.