diff options
| author | Jonathan Bauer | 2011-03-25 21:12:57 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2011-03-25 21:12:57 +0100 |
| commit | 59f5fad1a13465ae189cdb8882a0c4b9b51bcb75 (patch) | |
| tree | 5d69bbe1f6ad1b7688558d6d8fd1f79167d11c8f /src | |
| parent | removed old test (diff) | |
| download | fbgui-59f5fad1a13465ae189cdb8882a0c4b9b51bcb75.tar.gz fbgui-59f5fad1a13465ae189cdb8882a0c4b9b51bcb75.tar.xz fbgui-59f5fad1a13465ae189cdb8882a0c4b9b51bcb75.zip | |
today's fixes, POST mostly
Diffstat (limited to 'src')
| -rw-r--r-- | src/fbgui.cpp | 4 | ||||
| -rw-r--r-- | src/fbgui.qrc | 1 | ||||
| -rwxr-xr-x | src/testApp.sh | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/fbgui.cpp b/src/fbgui.cpp index 9dec027..c263b38 100644 --- a/src/fbgui.cpp +++ b/src/fbgui.cpp @@ -196,8 +196,8 @@ QByteArray fbgui::generatePOSTData() qxtLog->debug() << "[post] Serial number is: " << serial; // construct final byte array - QByteArray postData("bootisoID=1"); - postData.append("&mac=" + si.getInfo("mac")); + QByteArray postData("mac="); + postData.append(si.getInfo("mac")); postData.append("&hardwarehash=" + hash.toHex()); postData.append("&serialnumber=" + serial); return postData; diff --git a/src/fbgui.qrc b/src/fbgui.qrc index 336cb2f..049168f 100644 --- a/src/fbgui.qrc +++ b/src/fbgui.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/"> - <file>html/loadAbout.html</file> <file>html/js/jquery-1.4.4.min.js</file> <file>html/js/jquery-1.5.1.min.js</file> <file>html/js/jquery-ui-1.8.11.min.js</file> diff --git a/src/testApp.sh b/src/testApp.sh index 9cf6e0a..0ae691e 100755 --- a/src/testApp.sh +++ b/src/testApp.sh @@ -19,7 +19,7 @@ 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 800 -height 600 -qwsdisplay :$display_id & +/usr/local/Trolltech/Qt-4.7.2/bin/qvfb -width 1024 -height 768 -qwsdisplay :$display_id & sleep 0.2 # Start fbgui connecting to QVFb with display_id from above. $working_path/fbgui -display QVFb:$display_id $@ |