README deps updatedHEADmaster

6 files changed, 14 insertions, 9 deletions

diff --git a/README b/README
index fa0194f..0237a26 100644
--- a/README
+++ b/README
@@ -33,8 +33,10 @@ Debug console setup:
 
 Dependancies:
  QT-Framework
- log4cxx-dev package 
- sysfsutils
- libnl
+ liblog4cxx10-dev 
+ libsysfs-dev
+ libusb-1.0-0-dev
+ libnl-dev
+ (sysfsutils?)
 
 (TODO: rest of deps)
diff --git a/pkg.sh b/pkg.sh
index fcb1e2a..f4699c7 100755
--- a/pkg.sh
+++ b/pkg.sh
@@ -3,7 +3,7 @@
 # To compile use: 
 #          ./build.sh (TODO)
 
-QT_VERSION=QtEmbedded-4.8.0
+QT_VERSION=QtEmbedded-4.8.2
 
 [ -f fbgui.tgz ] && rm fbgui.tgz
 
diff --git a/src/fbgui/fbgui.cpp b/src/fbgui/fbgui.cpp
index b4a92ca..9cb906d 100644
--- a/src/fbgui/fbgui.cpp
+++ b/src/fbgui/fbgui.cpp
@@ -140,7 +140,7 @@ void fbgui::loadURL() {
 }
 void fbgui::sslErrorHandler(QNetworkReply* rep, QList<QSslError> errList) {
 		LOG4CXX_DEBUG(coreLogger, "Received SSL errors:");
-		rep->ignoreSslErrors(errList);
+		//rep->ignoreSslErrors(errList);
 		QList<QSslError>::iterator n;
 		for (n = errList.begin(); n != errList.end(); ++n) {
 			LOG4CXX_DEBUG(coreLogger, "Error :" << n->errorString());
diff --git a/src/fbgui/globals.h b/src/fbgui/globals.h
index 353bda3..2cc2872 100644
--- a/src/fbgui/globals.h
+++ b/src/fbgui/globals.h
@@ -2,6 +2,7 @@
 #define GLOBALS_H_
 
 // fbgui default settings
+#define VERSION "0.1.1"
 #define DEFAULT_URL "http://www.google.com"
 #define DEFAULT_DOWNLOAD_DIR "/tmp/fbgui"
 #define DEFAULT_CONFIG_PATH "/etc/fbgui.conf"
diff --git a/src/fbgui/main.cpp b/src/fbgui/main.cpp
index 09a1b45..4d04b9e 100644
--- a/src/fbgui/main.cpp
+++ b/src/fbgui/main.cpp
@@ -293,14 +293,16 @@ int main(int argc, char *argv[]) {
 
 	// print config
 	LOG4CXX_DEBUG(logger, "*************   CONFIG INFO   *************");
+	LOG4CXX_DEBUG(logger, "Version:          " << VERSION);
 	LOG4CXX_DEBUG(logger, "configFilePath:   " << configFilePath);
 	LOG4CXX_DEBUG(logger, "logFilePath:      " << logFilePath);
+	LOG4CXX_DEBUG(logger, "logConfigPath:    " << loggingConfigFilePath);
 	LOG4CXX_DEBUG(logger, "ipConfigFilePath: " << ipConfigFilePath);
 	LOG4CXX_DEBUG(logger, "baseURL:          " << baseURL.toString());
 	LOG4CXX_DEBUG(logger, "downloadDir :     " << downloadPath);
 	LOG4CXX_DEBUG(logger, "trigger:          " << fileToTriggerURL);
 	LOG4CXX_DEBUG(logger, "serialLocation:   " << serialLocation);
-   LOG4CXX_DEBUG(logger, "ssl:   			" << sslSupport);
+    LOG4CXX_DEBUG(logger, "ssl:   			 " << sslSupport);
 	if (clOpts.contains("nd") || confFileSettings.contains("default/nd")) {
 		LOG4CXX_DEBUG(logger, "*******************************************");
 		LOG4CXX_DEBUG(logger, "Network Discovery activated:");
diff --git a/testApp.sh b/testApp.sh
index 56e467a..fe9e7e6 100755
--- a/testApp.sh
+++ b/testApp.sh
@@ -12,9 +12,9 @@
 #
 # Note: all path are expected to be absolute.
 # Adapt these to your own system.
-QT_VERSION=Qt-4.8.0
-#PATH_TO_FBGUI_BUILD=~/fbgui/build
-PATH_TO_FBGUI_BUILD=~/workspace/fbgui
+QT_VERSION=Qt-4.8.2
+PATH_TO_FBGUI_BUILD=~/fbgui/build
+#PATH_TO_FBGUI_BUILD=~/workspace/fbgui
 
 # check if network discovery is activated and if running as root
 for ARG in $*