From da825833566bf767f2a0b7a49acd1efeef4f5170 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 18 Jan 2011 15:43:25 +0100
Subject: network include...

---
 fbbrowser/fbbrowser         | Bin 517894 -> 518639 bytes
 fbbrowser/fbbrowser.h       |   2 +-
 fbbrowser/fbbrowser.pro     |   4 ++--
 fbbrowser/moc_fbbrowser.cpp |   2 +-
 fbbrowser/testApp.sh        |   2 +-
 fbbrowser/ui_fbbrowser.h    |   2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'fbbrowser')

diff --git a/fbbrowser/fbbrowser b/fbbrowser/fbbrowser
index 2e819e1..7217e13 100755
Binary files a/fbbrowser/fbbrowser and b/fbbrowser/fbbrowser differ
diff --git a/fbbrowser/fbbrowser.h b/fbbrowser/fbbrowser.h
index b8182b2..8b818c8 100644
--- a/fbbrowser/fbbrowser.h
+++ b/fbbrowser/fbbrowser.h
@@ -3,7 +3,7 @@
 
 #include <QtGui>
 #include "ui_fbbrowser.h"
-#include <qnetworkaccessmanager.h>
+#include <QtNetwork>
 
 class QWebView;
 QT_BEGIN_NAMESPACE
diff --git a/fbbrowser/fbbrowser.pro b/fbbrowser/fbbrowser.pro
index b9ca306..f3cd992 100644
--- a/fbbrowser/fbbrowser.pro
+++ b/fbbrowser/fbbrowser.pro
@@ -3,8 +3,8 @@ TARGET = fbbrowser
 CONFIG += qt debug
 QT += core \
     gui \
-    webkit
-INCLUDEPATH += /usr/local/Trolltech/Qt-4.7.1/include/QtNetwork
+    webkit \
+    network
 HEADERS += fbbrowser.h
 SOURCES += main.cpp \
     fbbrowser.cpp
diff --git a/fbbrowser/moc_fbbrowser.cpp b/fbbrowser/moc_fbbrowser.cpp
index 8fbe56b..bb40018 100644
--- a/fbbrowser/moc_fbbrowser.cpp
+++ b/fbbrowser/moc_fbbrowser.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** Meta object code from reading C++ file 'fbbrowser.h'
 **
-** Created: Tue Jan 18 15:23:20 2011
+** Created: Tue Jan 18 15:37:45 2011
 **      by: The Qt Meta Object Compiler version 62 (Qt 4.7.1)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/fbbrowser/testApp.sh b/fbbrowser/testApp.sh
index 57f37b7..978fc42 100755
--- a/fbbrowser/testApp.sh
+++ b/fbbrowser/testApp.sh
@@ -7,7 +7,7 @@ sleep 1
 # This requires the fbgui git repository to be in the user's home directory.
 ~/fbgui/fbbrowser/fbbrowser -qws
 # Check if fbbrowser is not running, if so kill the qvfb.
-if ps aux | grep -v grep | grep fbbrowser > /dev/null
+if [ $(ps aux | grep -v grep | grep -c fbbrowser) -eq 1 ]
 then
 	echo "fbbrowser is still running ..."
 else
diff --git a/fbbrowser/ui_fbbrowser.h b/fbbrowser/ui_fbbrowser.h
index b528df1..5c5d7b1 100644
--- a/fbbrowser/ui_fbbrowser.h
+++ b/fbbrowser/ui_fbbrowser.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'fbbrowser.ui'
 **
-** Created: Tue Jan 18 15:23:16 2011
+** Created: Tue Jan 18 15:37:41 2011
 **      by: Qt User Interface Compiler version 4.7.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
-- 
cgit v1.2.3-55-g7522