From ec64ec206eb121e22fc601231a24cd77c50c659f Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 24 Jun 2011 16:05:01 +0200
Subject: minor changes

---
 README          |  8 +++++++-
 src/sysinfo.cpp |  2 ++
 testApp.sh      | 13 ++++---------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 8c226d1..9cf6ab1 100644
--- a/README
+++ b/README
@@ -17,7 +17,13 @@ What does this do excatly?
  (Note: The website content is crucial to the successfull execution of this program!)
 
 How to build/use it?
-  Simply run ./build.sh to create a package of fbgui (including all the required libs).
+
+  First compile the source code using:
+	./build.sh
+
+  To build the package first compile then use:
+	./build.pkg.sh
+  
   To integrate into a Preboot-Media, follow instructions on the wiki.
 
 Dependancies:
diff --git a/src/sysinfo.cpp b/src/sysinfo.cpp
index e942e94..7d6ac92 100644
--- a/src/sysinfo.cpp
+++ b/src/sysinfo.cpp
@@ -172,7 +172,9 @@ const QString SysInfo::getUsbVendorIdProductIdSerialNumber() {
    libusb_free_device_list(devs, 1); //free the list, unref the devices in it
    libusb_exit(ctx); //close the session
 
+   /*
    QByteArray json = serializer.serialize(list);
    qxtLog->debug() << tag + "json object: " + json;
    return json;
+   */
 }
diff --git a/testApp.sh b/testApp.sh
index e1f1d1e..054169d 100755
--- a/testApp.sh
+++ b/testApp.sh
@@ -11,6 +11,7 @@
 #               -s <path>,  --serial=<path>   sets path to serial number file
 #
 # Note: all path are expected to be absolute.
+QT_VERSION=Qt-4.7.2
 
 # clean /tmp/fbgui
 rm -rf /tmp/fbgui
@@ -26,16 +27,10 @@ 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 display_id
-/usr/local/Trolltech/Qt-4.7.2/bin/qvfb -width 1024 -height 768 -qwsdisplay :$display_id &
+/usr/local/Trolltech/$QT_VERSION/bin/qvfb -width 1024 -height 768 -qwsdisplay :$display_id &
 # quick sleep to wait for qvfb loading
 sleep 0.2
 # Start fbgui connecting to QVFb with display_id from above.
 $working_path/build/fbgui -display QVFb:$display_id $@
-# Check if fbbrowser is not running, if so kill the qvfb.
-if [ $(ps aux | grep -v grep | grep -c fbgui) -eq 1 ]
-then
-	echo "fbgui is still running ..."
-else
-	echo "fbgui stopped running, killing qvfb ..."
-	killall qvfb
-fi
+# kill qvfb since fbgui stopped
+killall qvfb
-- 
cgit v1.2.3-55-g7522