Skip to content

Commit

Permalink
Remove qt3d, qtlocation and qtsensors, we don't need them for QtWebKi…
Browse files Browse the repository at this point in the history
…t long time ago.
  • Loading branch information
ossy-szeged committed Jul 1, 2013
1 parent 113115b commit 8d868df
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 29 deletions.
8 changes: 0 additions & 8 deletions build-qt5-env
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
QT_WEEKLY_REV=Qt-5.0.1
WEEKLY_QT5_HASH="v5.0.1"
QT5_MODULES="qtjsbackend qtdeclarative"

NON_QT5_MODULES="qt3d qtlocation qtsensors"
qt3d_HASH="1ce13f86c7066721ce80258d6a89baccc4030066"
qt3d_BRANCH="master"
qtlocation_HASH="1e8989fcb10f04daf5ec1c21d36e829dfbde62ec"
qtlocation_BRANCH="master"
qtsensors_HASH="a199068d2aecd8a7faaed3e098253b6e6c542e59"
qtsensors_BRANCH="stable"
22 changes: 1 addition & 21 deletions build-qt5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,6 @@ if [ ! -d qtsdk ]; then
git clone -b master $MIRROR_URL"/qtsdk/qtsdk.git" qtsdk
fi

for module in $NON_QT5_MODULES
do
if [ ! -d qtsdk/$module ]; then
module_branch="${module}_BRANCH"
git clone -b ${!module_branch} $MIRROR_URL"/qt/"$module".git" qtsdk/$module
fi
done


cd qtsdk
git checkout stable
git clean -dxf
Expand All @@ -95,17 +86,6 @@ echo ==========================================================
git submodule status
echo ==========================================================

for module in $NON_QT5_MODULES
do
module_hash="${module}_HASH"
module_branch="${module}_BRANCH"
cd $module && git checkout ${!module_branch} && git clean -dxf && git reset --hard HEAD && git fetch && git checkout ${!module_hash} && cd ..
if [ $? -ne 0 ] ; then
echo FAIL: updating $module
exit 1
fi
done

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

Expand All @@ -117,7 +97,7 @@ if [ $? -ne 0 ] ; then
exit 1
fi

for module in $QT5_MODULES $NON_QT5_MODULES
for module in $QT5_MODULES
do
cd $module && qmake && make $THREADS && if [ ! $DEVELOPER_BUILD ]; then make install; fi && cd ..
if [ $? -ne 0 ] ; then
Expand Down

0 comments on commit 8d868df

Please sign in to comment.