diff options
| author | Jonathan Bauer | 2012-01-31 14:03:29 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2012-01-31 14:03:29 +0100 |
| commit | 9b0591ae285562120891c47cbe5108a601752591 (patch) | |
| tree | 9d38a86e1d7ad4f003539c936df9c35bce378128 | |
| parent | build ignore (diff) | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/fbgui (diff) | |
| download | fbgui-9b0591ae285562120891c47cbe5108a601752591.tar.gz fbgui-9b0591ae285562120891c47cbe5108a601752591.tar.xz fbgui-9b0591ae285562120891c47cbe5108a601752591.zip | |
fix?
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | testApp.sh | 8 |
2 files changed, 9 insertions, 0 deletions
@@ -18,3 +18,4 @@ Debug /doxygen/latex/* /doxygen/man/* /build +testApp.sh @@ -11,6 +11,9 @@ # -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 @@ -26,6 +29,7 @@ if [ "x$ARG" = "x-n" ]; then fi fi done +>>>>>>> 2abf1cec73371fb4a97a078a47f521d23fbf0775 # clean /tmp/fbgui [ -d /tmp/fbgui ] && rm -rf /tmp/fbgui @@ -46,6 +50,10 @@ 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 |