gistfile1.diff

diff --git a/clone-sources.sh b/clone-sources.sh
index ed0a8a2..7f93321 100755
--- a/clone-sources.sh
+++ b/clone-sources.sh
@@ -18,7 +18,7 @@ else
     git clone [email protected]:qt/qt5.git qt5
     cd qt5
     git checkout $qt5hash
-    ./init-repository --ssh --module-subset=qtbase,qtxmlpatterns,qtjsbackend,qtscript,qtdeclarative,qtsensors,qtlocation,qt3d,qtimageformats,qtquick1
+    ./init-repository $use_ssh --module-subset=qtbase,qtxmlpatterns,qtjsbackend,qtscript,qtdeclarative,qtsensors,qtlocation,qt3d,qtimageformats,qtquick1
     (cd qtbase && git fetch http://codereview.qt-project.org/p/qt/qtbase refs/changes/54/15954/1 && git cherry-pick FETCH_HEAD)
     (cd qtquick1 && git fetch http://codereview.qt-project.org/p/qt/qtquick1 refs/changes/81/15981/1 && git cherry-pick FETCH_HEAD)
 fi
diff --git a/common.sh b/common.sh
index 62afc32..a4e6afc 100755
--- a/common.sh
+++ b/common.sh
@@ -79,6 +79,7 @@ webkit="qtwebkit-webkit2-dev"
 release=
 valgrind=
 clean=
+use_ssh=--ssh
 while [ $# -gt 0 ]; do
     case $1 in
         --release)
@@ -117,6 +118,10 @@ while [ $# -gt 0 ]; do
             clean=1
             shift
             ;;
+	--no-ssh)
+	    use_ssh=
+	    shift
+	    ;;
         *)
             die "unknown flag $1"
             break
diff --git a/create-icecc-env.sh b/create-icecc-env.sh
index eddb9f3..8b17b9a 100755
--- a/create-icecc-env.sh
+++ b/create-icecc-env.sh
@@ -9,7 +9,7 @@ while [ $# != 0 ] ; do
                 icecc_environment=$2
                 shift
             else
-                echo "Please pass --environment [host | scratchbox]"
+                echo "Please pass --environment [host | scratchbox | cross]"
                 exit 1
             fi
             ;;
@@ -121,7 +121,7 @@ elif [ "x$icecc_environment" = "xscratchbox" ] ; then
         echo $workdir
         wget http://ftp.suse.com/pub/projects/icecream/icecc-0.9.7.tar.bz2 -O $workdir/icecc.tar.bz2
         tar xvjpf $workdir/icecc.tar.bz2 -C $workdir/
-        echo "cd /home/$USER/icecc/$(basename $workdir)/icecc-* && ./configure CC=host-gcc CXX=host-g++ && make -j2" | $sbdir/login -s
+        echo "cd /home/$USER/icecc/$(basename $workdir)/icecc-* && ./configure CC=gcc CXX=g++ && make -j2" | $sbdir/login -s
         echo "Done building... Need to install the binaries..."
         sudo cp $workdir/icecc-*/client/icecc $sbdir/tools/bin/icecc
         sudo ln -s icecc $sbdir/tools/bin/icecc++