diff options
| author | Niklas Goby | 2011-03-21 12:03:04 +0100 |
|---|---|---|
| committer | Niklas Goby | 2011-03-21 12:03:04 +0100 |
| commit | f2b5a82610ea4b9de9ff5f3ae83cd1715e79bc24 (patch) | |
| tree | 7234b2e8f2083fe23193bc1654c70ec395d20b12 /src/testApp.sh | |
| parent | some changes in the fbgui, ipWatcher (diff) | |
| parent | and the files ^^ (diff) | |
| download | fbgui-f2b5a82610ea4b9de9ff5f3ae83cd1715e79bc24.tar.gz fbgui-f2b5a82610ea4b9de9ff5f3ae83cd1715e79bc24.tar.xz fbgui-f2b5a82610ea4b9de9ff5f3ae83cd1715e79bc24.zip | |
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Conflicts:
src/fbgui.cpp
Diffstat (limited to 'src/testApp.sh')
| -rwxr-xr-x | src/testApp.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testApp.sh b/src/testApp.sh index 444636b..61f7c2d 100755 --- a/src/testApp.sh +++ b/src/testApp.sh @@ -11,7 +11,7 @@ script_path="$(cd "${0%/*}" 2>/dev/null; echo "$PWD"/"${0##*/}")" working_path=`dirname "$script_path"` display_id=$(grep -n $(whoami) /etc/passwd| head -n 1|awk -F : '{print $1}') # Start QT's virtual framebuffer with proper displayID -/usr/local/Trolltech/Qt-4.7.1/bin/qvfb -width 800 -height 600 -qwsdisplay :$display_id & +/usr/local/Trolltech/Qt-4.7.1/bin/qvfb -width 1024 -height 768 -qwsdisplay :$display_id & sleep 0.1 # Start fbgui. $working_path/fbgui -display QVFb:$display_id $@ |