summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2012-01-31 14:07:18 +0100
committerJonathan Bauer2012-01-31 14:07:18 +0100
commit0478dd670af2b2a76e09816f212b637510bd91c9 (patch)
treecb47a63aaa8bda24c459a289a2a1d52614c2b8cf
parentfix? (diff)
downloadfbgui-0478dd670af2b2a76e09816f212b637510bd91c9.tar.gz
fbgui-0478dd670af2b2a76e09816f212b637510bd91c9.tar.xz
fbgui-0478dd670af2b2a76e09816f212b637510bd91c9.zip
testApp.sh fixed, adapt path to your build
-rwxr-xr-xtestApp.sh8
1 files changed, 0 insertions, 8 deletions
diff --git a/testApp.sh b/testApp.sh
index 132208c..d9a02b3 100755
--- a/testApp.sh
+++ b/testApp.sh
@@ -11,9 +11,6 @@
# -s <path>, --serial=<path> sets path to serial number file
#
# Note: all path are expected to be absolute.
-<<<<<<< HEAD
-QT_VERSION=Qt-4.8.0
-=======
#
# Adapt these to your own system.
QT_VERSION=Qt-4.7.2
@@ -29,7 +26,6 @@ if [ "x$ARG" = "x-n" ]; then
fi
fi
done
->>>>>>> 2abf1cec73371fb4a97a078a47f521d23fbf0775
# clean /tmp/fbgui
[ -d /tmp/fbgui ] && rm -rf /tmp/fbgui
@@ -50,10 +46,6 @@ display_id=$(grep -n $(whoami) /etc/passwd| head -n 1|awk -F : '{print $1}')
# quick sleep to wait for qvfb loading
sleep 0.2
# Start fbgui connecting to QVFb with display_id from above.
-<<<<<<< HEAD
-$working_path/../workspace/fbgui/src/fbgui/fbgui -display QVFb:$display_id $@
-=======
$PATH_TO_FBGUI_BUILD/src/fbgui/fbgui -display QVFb:$display_id $@ -e $PATH_TO_FBGUI_BUILD/src/customdhcpcd/cdhcpcd
->>>>>>> 2abf1cec73371fb4a97a078a47f521d23fbf0775
# kill qvfb since fbgui stopped
killall qvfb