diff --git a/src/libgui/ObjectManipulator.h b/src/libgui/ObjectManipulator.h
index 89f788f76..eb56cb6c9 100644
--- a/src/libgui/ObjectManipulator.h
+++ b/src/libgui/ObjectManipulator.h
@@ -32,9 +32,9 @@
 #include "global.h"
 #include "utils.h"
 
-#include <qdialog.h>
-#include <qtreewidget.h>
-#include <qtooltip.h>
+#include <QDialog>
+#include <QTreeWidget>
+#include <QToolTip>
 #include <QMenu>
 
 #include <ui_objectmanipulator_q.h>
diff --git a/src/unit_tests/AddressRangeDialogTest/AddressRangeDialogTest.cpp b/src/unit_tests/AddressRangeDialogTest/AddressRangeDialogTest.cpp
index 32de0afa9..f883b7323 100644
--- a/src/unit_tests/AddressRangeDialogTest/AddressRangeDialogTest.cpp
+++ b/src/unit_tests/AddressRangeDialogTest/AddressRangeDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "AddressRangeDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/AddressRangeDialogTest/AddressRangeDialogTest.pro b/src/unit_tests/AddressRangeDialogTest/AddressRangeDialogTest.pro
index 677b0e3ff..b610a2a8e 100644
--- a/src/unit_tests/AddressRangeDialogTest/AddressRangeDialogTest.pro
+++ b/src/unit_tests/AddressRangeDialogTest/AddressRangeDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = AddressRangeDialogTest
 CONFIG += console
 CONFIG -= app_bundle
diff --git a/src/unit_tests/CustomServiceDialogTest/CustomServiceDialogTest.cpp b/src/unit_tests/CustomServiceDialogTest/CustomServiceDialogTest.cpp
index 93a495669..5a9079929 100644
--- a/src/unit_tests/CustomServiceDialogTest/CustomServiceDialogTest.cpp
+++ b/src/unit_tests/CustomServiceDialogTest/CustomServiceDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "CustomServiceDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/CustomServiceDialogTest/CustomServiceDialogTest.pro b/src/unit_tests/CustomServiceDialogTest/CustomServiceDialogTest.pro
index dbbac3e8e..f844fdec3 100644
--- a/src/unit_tests/CustomServiceDialogTest/CustomServiceDialogTest.pro
+++ b/src/unit_tests/CustomServiceDialogTest/CustomServiceDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = CustomServiceDialogTest
 CONFIG += console
 CONFIG -= app_bundle
diff --git a/src/unit_tests/FWWindowTest/FWWindowTest.h b/src/unit_tests/FWWindowTest/FWWindowTest.h
index b2fe51f5b..bfbf6022e 100644
--- a/src/unit_tests/FWWindowTest/FWWindowTest.h
+++ b/src/unit_tests/FWWindowTest/FWWindowTest.h
@@ -26,7 +26,7 @@
 #ifndef FWWINDOWTEST_H
 #define FWWINDOWTEST_H
 
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 #include <QTest>
 #include <QMessageBox>
 
diff --git a/src/unit_tests/FWWindowTest/FWWindowTest.pro b/src/unit_tests/FWWindowTest/FWWindowTest.pro
index 4cadba267..79a79aec0 100644
--- a/src/unit_tests/FWWindowTest/FWWindowTest.pro
+++ b/src/unit_tests/FWWindowTest/FWWindowTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 
 TARGET = FWWindowTest
 HEADERS += FWWindowTest.h
diff --git a/src/unit_tests/FirewallDialogTest/FirewallDialogTest.cpp b/src/unit_tests/FirewallDialogTest/FirewallDialogTest.cpp
index 0128ffa12..9e616a3ce 100644
--- a/src/unit_tests/FirewallDialogTest/FirewallDialogTest.cpp
+++ b/src/unit_tests/FirewallDialogTest/FirewallDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "FirewallDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/FirewallDialogTest/FirewallDialogTest.pro b/src/unit_tests/FirewallDialogTest/FirewallDialogTest.pro
index 1688762fa..a1b8bf733 100644
--- a/src/unit_tests/FirewallDialogTest/FirewallDialogTest.pro
+++ b/src/unit_tests/FirewallDialogTest/FirewallDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = FirewallDialogTest
 SOURCES += main_FirewallDialogTest.cpp \
            FirewallDialogTest.cpp
diff --git a/src/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp b/src/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp
index 5f2092c06..1bed51957 100644
--- a/src/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp
+++ b/src/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "GroupObjectDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.pro b/src/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.pro
index 6dac6ceb5..18989aacf 100644
--- a/src/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.pro
+++ b/src/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = GroupObjectDialogTest
 SOURCES += main_GroupObjectDialogTest.cpp \
     GroupObjectDialogTest.cpp
diff --git a/src/unit_tests/ICMP6ServiceDialogTest/ICMP6ServiceDialogTest.cpp b/src/unit_tests/ICMP6ServiceDialogTest/ICMP6ServiceDialogTest.cpp
index 59b9b0485..5826a8684 100644
--- a/src/unit_tests/ICMP6ServiceDialogTest/ICMP6ServiceDialogTest.cpp
+++ b/src/unit_tests/ICMP6ServiceDialogTest/ICMP6ServiceDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "ICMP6ServiceDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/ICMP6ServiceDialogTest/ICMP6ServiceDialogTest.pro b/src/unit_tests/ICMP6ServiceDialogTest/ICMP6ServiceDialogTest.pro
index 73bb291f8..3757814dc 100644
--- a/src/unit_tests/ICMP6ServiceDialogTest/ICMP6ServiceDialogTest.pro
+++ b/src/unit_tests/ICMP6ServiceDialogTest/ICMP6ServiceDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = ICMP6ServiceDialogTest
 SOURCES += main_ICMP6ServiceDialogTest.cpp \
     ICMP6ServiceDialogTest.cpp
diff --git a/src/unit_tests/ICMPServiceDialogTest/ICMPServiceDialogTest.cpp b/src/unit_tests/ICMPServiceDialogTest/ICMPServiceDialogTest.cpp
index cb2dba0a7..4fe60293e 100644
--- a/src/unit_tests/ICMPServiceDialogTest/ICMPServiceDialogTest.cpp
+++ b/src/unit_tests/ICMPServiceDialogTest/ICMPServiceDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "ICMPServiceDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/ICMPServiceDialogTest/ICMPServiceDialogTest.pro b/src/unit_tests/ICMPServiceDialogTest/ICMPServiceDialogTest.pro
index fb7406c98..1b1c0669e 100644
--- a/src/unit_tests/ICMPServiceDialogTest/ICMPServiceDialogTest.pro
+++ b/src/unit_tests/ICMPServiceDialogTest/ICMPServiceDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = ICMPServiceDialogTest
 SOURCES += main_ICMPServiceDialogTest.cpp \
     ICMPServiceDialogTest.cpp
diff --git a/src/unit_tests/IPDialogTest/IPDialogTest.cpp b/src/unit_tests/IPDialogTest/IPDialogTest.cpp
index 7f39beddc..359891942 100644
--- a/src/unit_tests/IPDialogTest/IPDialogTest.cpp
+++ b/src/unit_tests/IPDialogTest/IPDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "IPDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/IPDialogTest/IPDialogTest.pro b/src/unit_tests/IPDialogTest/IPDialogTest.pro
index a86439445..51cd441db 100644
--- a/src/unit_tests/IPDialogTest/IPDialogTest.pro
+++ b/src/unit_tests/IPDialogTest/IPDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = IPDialogTest
 SOURCES += main_IPDialogTest.cpp \
     IPDialogTest.cpp
diff --git a/src/unit_tests/IPServiceDialogTest/IPServiceDialogTest.cpp b/src/unit_tests/IPServiceDialogTest/IPServiceDialogTest.cpp
index f9db39130..83633178e 100644
--- a/src/unit_tests/IPServiceDialogTest/IPServiceDialogTest.cpp
+++ b/src/unit_tests/IPServiceDialogTest/IPServiceDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "IPServiceDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/IPServiceDialogTest/IPServiceDialogTest.pro b/src/unit_tests/IPServiceDialogTest/IPServiceDialogTest.pro
index 617ab4fb8..f654349bd 100644
--- a/src/unit_tests/IPServiceDialogTest/IPServiceDialogTest.pro
+++ b/src/unit_tests/IPServiceDialogTest/IPServiceDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = IPServiceDialogTest
 SOURCES += main_IPServiceDialogTest.cpp \
     IPServiceDialogTest.cpp
diff --git a/src/unit_tests/ImporterTest/ImporterTest.cpp b/src/unit_tests/ImporterTest/ImporterTest.cpp
index e07265b18..4ca54a2d0 100644
--- a/src/unit_tests/ImporterTest/ImporterTest.cpp
+++ b/src/unit_tests/ImporterTest/ImporterTest.cpp
@@ -131,7 +131,7 @@ void ImporterTest::compareResults(QueueLogger* logger,
 
     QFile rw(obtained_result_file_name);
     rw.open(QFile::WriteOnly);
-    rw.write(result.toAscii());
+    rw.write(result.toLocal8Bit());
     rw.close();
 
     QFile rr(expected_result_file_name);
diff --git a/src/unit_tests/ImporterTest/ImporterTest.pro b/src/unit_tests/ImporterTest/ImporterTest.pro
index f9c0c55f4..4c1db87af 100644
--- a/src/unit_tests/ImporterTest/ImporterTest.pro
+++ b/src/unit_tests/ImporterTest/ImporterTest.pro
@@ -1,6 +1,7 @@
 include(../tests_common.pri)
 
+QT += widgets printsupport
 TARGET = ImporterTest
 HEADERS += ImporterTest.h
 SOURCES += main_ImporterTest.cpp \
-        ImporterTest.cpp
\ No newline at end of file
+        ImporterTest.cpp
diff --git a/src/unit_tests/InterfaceDialogTest/InterfaceDialogTest.cpp b/src/unit_tests/InterfaceDialogTest/InterfaceDialogTest.cpp
index df7abed07..a62d3867d 100644
--- a/src/unit_tests/InterfaceDialogTest/InterfaceDialogTest.cpp
+++ b/src/unit_tests/InterfaceDialogTest/InterfaceDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "InterfaceDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/InterfaceDialogTest/InterfaceDialogTest.pro b/src/unit_tests/InterfaceDialogTest/InterfaceDialogTest.pro
index c8c8f13ef..923ec3d65 100644
--- a/src/unit_tests/InterfaceDialogTest/InterfaceDialogTest.pro
+++ b/src/unit_tests/InterfaceDialogTest/InterfaceDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = InterfaceDialogTest
 SOURCES += main_InterfaceDialogTest.cpp \
     InterfaceDialogTest.cpp
diff --git a/src/unit_tests/NetworkDialogTest/NetworkDialogTest.cpp b/src/unit_tests/NetworkDialogTest/NetworkDialogTest.cpp
index f854830a4..44a6eb45e 100644
--- a/src/unit_tests/NetworkDialogTest/NetworkDialogTest.cpp
+++ b/src/unit_tests/NetworkDialogTest/NetworkDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "NetworkDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/NetworkDialogTest/NetworkDialogTest.pro b/src/unit_tests/NetworkDialogTest/NetworkDialogTest.pro
index e1a8e083f..6d297b5b1 100644
--- a/src/unit_tests/NetworkDialogTest/NetworkDialogTest.pro
+++ b/src/unit_tests/NetworkDialogTest/NetworkDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = NetworkDialogTests
 SOURCES += main_NetworkDialogTest.cpp \
     NetworkDialogTest.cpp
diff --git a/src/unit_tests/ObjectManipulatorTest/ObjectManipulatorTest.cpp b/src/unit_tests/ObjectManipulatorTest/ObjectManipulatorTest.cpp
index 5238db246..76ba8e429 100644
--- a/src/unit_tests/ObjectManipulatorTest/ObjectManipulatorTest.cpp
+++ b/src/unit_tests/ObjectManipulatorTest/ObjectManipulatorTest.cpp
@@ -25,12 +25,12 @@
 
 #include "ObjectManipulatorTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/ObjectManipulatorTest/ObjectManipulatorTest.pro b/src/unit_tests/ObjectManipulatorTest/ObjectManipulatorTest.pro
index 9bebe0070..b0b5b8be2 100644
--- a/src/unit_tests/ObjectManipulatorTest/ObjectManipulatorTest.pro
+++ b/src/unit_tests/ObjectManipulatorTest/ObjectManipulatorTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = ObjectManipulatorTest
 SOURCES += main_ObjectManipulatorTest.cpp \
     ObjectManipulatorTest.cpp
diff --git a/src/unit_tests/PFImporterTest/PFImporterTest.pro b/src/unit_tests/PFImporterTest/PFImporterTest.pro
index 9239db8d3..02ba7457e 100644
--- a/src/unit_tests/PFImporterTest/PFImporterTest.pro
+++ b/src/unit_tests/PFImporterTest/PFImporterTest.pro
@@ -1,5 +1,6 @@
 include(../tests_common.pri)
 
+QT += widgets printsupport
 TARGET = PFImporterTest
 HEADERS += PFImporterTest.h
 SOURCES += main_PFImporterTest.cpp \
diff --git a/src/unit_tests/PIXImporterTest/PIXImporterTest.pro b/src/unit_tests/PIXImporterTest/PIXImporterTest.pro
index dcc621a8d..998d02b19 100644
--- a/src/unit_tests/PIXImporterTest/PIXImporterTest.pro
+++ b/src/unit_tests/PIXImporterTest/PIXImporterTest.pro
@@ -1,5 +1,6 @@
 include(../tests_common.pri)
 
+QT += widgets printsupport
 TARGET = PIXImporterTest
 HEADERS += PIXImporterTest.h
 SOURCES += main_PIXImporterTest.cpp \
diff --git a/src/unit_tests/RCS/RCSTest.cpp b/src/unit_tests/RCS/RCSTest.cpp
index 8d2d1539c..598115dcd 100644
--- a/src/unit_tests/RCS/RCSTest.cpp
+++ b/src/unit_tests/RCS/RCSTest.cpp
@@ -25,13 +25,13 @@
 
 #include "RCSTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 #include "../../libgui/RCS.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 
 #include <iostream>
 
diff --git a/src/unit_tests/RCS/RCSTest.pro b/src/unit_tests/RCS/RCSTest.pro
index c73398f7b..2d9ac1c78 100644
--- a/src/unit_tests/RCS/RCSTest.pro
+++ b/src/unit_tests/RCS/RCSTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += gui network
+QT += gui widgets printsupport network
 
 HEADERS	+= RCSTest.h
 SOURCES	+=  main_RCS.cpp \
diff --git a/src/unit_tests/RuleSetViewContextMenuTest/RuleSetViewContextMenuTest.pro b/src/unit_tests/RuleSetViewContextMenuTest/RuleSetViewContextMenuTest.pro
index 65d984228..afa49722e 100644
--- a/src/unit_tests/RuleSetViewContextMenuTest/RuleSetViewContextMenuTest.pro
+++ b/src/unit_tests/RuleSetViewContextMenuTest/RuleSetViewContextMenuTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = RuleSetViewContextMenuTest
 SOURCES += main_RuleSetViewContextMenuTest.cpp \
     RuleSetViewContextMenuTest.cpp
diff --git a/src/unit_tests/RuleSetViewTest/RuleSetViewTest.pro b/src/unit_tests/RuleSetViewTest/RuleSetViewTest.pro
index 46d3413bc..96404c128 100644
--- a/src/unit_tests/RuleSetViewTest/RuleSetViewTest.pro
+++ b/src/unit_tests/RuleSetViewTest/RuleSetViewTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = RuleSetViewTest
 SOURCES += main_RuleSetViewTest.cpp \
     RuleSetViewTest.cpp
diff --git a/src/unit_tests/TCPServiceDialogTest/TCPServiceDialogTest.cpp b/src/unit_tests/TCPServiceDialogTest/TCPServiceDialogTest.cpp
index 302b56307..3b42665d7 100644
--- a/src/unit_tests/TCPServiceDialogTest/TCPServiceDialogTest.cpp
+++ b/src/unit_tests/TCPServiceDialogTest/TCPServiceDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "TCPServiceDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/TCPServiceDialogTest/TCPServiceDialogTest.pro b/src/unit_tests/TCPServiceDialogTest/TCPServiceDialogTest.pro
index 0ce2d6bd2..4d6dba638 100644
--- a/src/unit_tests/TCPServiceDialogTest/TCPServiceDialogTest.pro
+++ b/src/unit_tests/TCPServiceDialogTest/TCPServiceDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = TCPServiceDialogTest
 SOURCES += main_TCPServiceDialogTest.cpp \
     TCPServiceDialogTest.cpp
diff --git a/src/unit_tests/TagServiceDialogTest/TagServiceDialogTest.cpp b/src/unit_tests/TagServiceDialogTest/TagServiceDialogTest.cpp
index b7bfd02dc..5e55d7170 100644
--- a/src/unit_tests/TagServiceDialogTest/TagServiceDialogTest.cpp
+++ b/src/unit_tests/TagServiceDialogTest/TagServiceDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "TagServiceDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/TagServiceDialogTest/TagServiceDialogTest.pro b/src/unit_tests/TagServiceDialogTest/TagServiceDialogTest.pro
index 31a7ab953..6ab7615f7 100644
--- a/src/unit_tests/TagServiceDialogTest/TagServiceDialogTest.pro
+++ b/src/unit_tests/TagServiceDialogTest/TagServiceDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = TagServiceDialogTest
 SOURCES += main_TagServiceDialogTest.cpp \
     TagServiceDialogTest.cpp
diff --git a/src/unit_tests/UDPServiceDialogTest/UDPServiceDialogTest.cpp b/src/unit_tests/UDPServiceDialogTest/UDPServiceDialogTest.cpp
index 7db110fbd..ae4d07494 100644
--- a/src/unit_tests/UDPServiceDialogTest/UDPServiceDialogTest.cpp
+++ b/src/unit_tests/UDPServiceDialogTest/UDPServiceDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "UDPServiceDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/UDPServiceDialogTest/UDPServiceDialogTest.pro b/src/unit_tests/UDPServiceDialogTest/UDPServiceDialogTest.pro
index f5f07460c..2b8b57260 100644
--- a/src/unit_tests/UDPServiceDialogTest/UDPServiceDialogTest.pro
+++ b/src/unit_tests/UDPServiceDialogTest/UDPServiceDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = UDPServiceDialogTest
 SOURCES += main_UDPServiceDialogTest.cpp \
     UDPServiceDialogTest.cpp
diff --git a/src/unit_tests/UserSerivceDialogTest/UserServiceDialogTest.cpp b/src/unit_tests/UserSerivceDialogTest/UserServiceDialogTest.cpp
index 16d86abaa..6da251129 100644
--- a/src/unit_tests/UserSerivceDialogTest/UserServiceDialogTest.cpp
+++ b/src/unit_tests/UserSerivceDialogTest/UserServiceDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "UserServiceDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/UserSerivceDialogTest/UserServiceDialogTest.pro b/src/unit_tests/UserSerivceDialogTest/UserServiceDialogTest.pro
index a5a674934..bc76ad1ac 100644
--- a/src/unit_tests/UserSerivceDialogTest/UserServiceDialogTest.pro
+++ b/src/unit_tests/UserSerivceDialogTest/UserServiceDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = UserServiceDialogTest
 SOURCES += main_UserServiceDialogTest.cpp \
     UserServiceDialogTest.cpp
diff --git a/src/unit_tests/generatedScriptTestsIpfilter/generatedScriptTestsIpfilter.pro b/src/unit_tests/generatedScriptTestsIpfilter/generatedScriptTestsIpfilter.pro
index b9642985a..0b4362d2c 100644
--- a/src/unit_tests/generatedScriptTestsIpfilter/generatedScriptTestsIpfilter.pro
+++ b/src/unit_tests/generatedScriptTestsIpfilter/generatedScriptTestsIpfilter.pro
@@ -1,5 +1,5 @@
 include(../tests_common.pri)
-QT += gui network
+QT += gui widgets printsupport network
 
 HEADERS = generatedScriptTestsIpfilter.h
 
diff --git a/src/unit_tests/generatedScriptTestsIpfilter/main_generatedScriptTestsIpfilter.cpp b/src/unit_tests/generatedScriptTestsIpfilter/main_generatedScriptTestsIpfilter.cpp
index be451a895..6ef37a31f 100644
--- a/src/unit_tests/generatedScriptTestsIpfilter/main_generatedScriptTestsIpfilter.cpp
+++ b/src/unit_tests/generatedScriptTestsIpfilter/main_generatedScriptTestsIpfilter.cpp
@@ -47,7 +47,6 @@ int main(int argc, char **argv)
     QApplication app(argc, argv, false);
 
     // compilers always write file names into manifest in Utf8
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("Utf8"));
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8"));
 
     init(argv);
diff --git a/src/unit_tests/generatedScriptTestsIpfw/generatedScriptTestsIpfw.pro b/src/unit_tests/generatedScriptTestsIpfw/generatedScriptTestsIpfw.pro
index 3ff7270d4..a6772a577 100644
--- a/src/unit_tests/generatedScriptTestsIpfw/generatedScriptTestsIpfw.pro
+++ b/src/unit_tests/generatedScriptTestsIpfw/generatedScriptTestsIpfw.pro
@@ -1,5 +1,5 @@
 include(../tests_common.pri)
-QT += gui network
+QT += gui widgets printsupport network
 
 HEADERS = generatedScriptTestsIpfw.h
 
diff --git a/src/unit_tests/generatedScriptTestsIpfw/main_generatedScriptTestsIpfw.cpp b/src/unit_tests/generatedScriptTestsIpfw/main_generatedScriptTestsIpfw.cpp
index e082367fe..e24afb4b3 100644
--- a/src/unit_tests/generatedScriptTestsIpfw/main_generatedScriptTestsIpfw.cpp
+++ b/src/unit_tests/generatedScriptTestsIpfw/main_generatedScriptTestsIpfw.cpp
@@ -47,7 +47,6 @@ int main(int argc, char **argv)
     QApplication app(argc, argv, false);
 
     // compilers always write file names into manifest in Utf8
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("Utf8"));
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8"));
 
     init(argv);
diff --git a/src/unit_tests/generatedScriptTestsLinux/generatedScriptTestsLinux.pro b/src/unit_tests/generatedScriptTestsLinux/generatedScriptTestsLinux.pro
index b2cf49473..aef6afac4 100644
--- a/src/unit_tests/generatedScriptTestsLinux/generatedScriptTestsLinux.pro
+++ b/src/unit_tests/generatedScriptTestsLinux/generatedScriptTestsLinux.pro
@@ -1,5 +1,5 @@
 include(../tests_common.pri)
-QT += gui network
+QT += gui widgets printsupport network
 
 HEADERS = generatedScriptTestsLinux.h
 SOURCES = main_generatedScriptTestsLinux.cpp \
diff --git a/src/unit_tests/generatedScriptTestsLinux/main_generatedScriptTestsLinux.cpp b/src/unit_tests/generatedScriptTestsLinux/main_generatedScriptTestsLinux.cpp
index 78b704dc7..7bd9d9049 100644
--- a/src/unit_tests/generatedScriptTestsLinux/main_generatedScriptTestsLinux.cpp
+++ b/src/unit_tests/generatedScriptTestsLinux/main_generatedScriptTestsLinux.cpp
@@ -47,7 +47,6 @@ int main(int argc, char **argv)
     QApplication app(argc, argv, false);
 
     // compilers always write file names into manifest in Utf8
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("Utf8"));
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8"));
 
     init(argv);
diff --git a/src/unit_tests/generatedScriptTestsPF/generatedScriptTestsPF.pro b/src/unit_tests/generatedScriptTestsPF/generatedScriptTestsPF.pro
index 3dd1278c2..19252d987 100644
--- a/src/unit_tests/generatedScriptTestsPF/generatedScriptTestsPF.pro
+++ b/src/unit_tests/generatedScriptTestsPF/generatedScriptTestsPF.pro
@@ -1,5 +1,5 @@
 include(../tests_common.pri)
-QT += gui network
+QT += gui widgets printsupport network
 HEADERS = generatedScriptTestsPF.h
 SOURCES = main_generatedScriptTestsPF.cpp \
 	  generatedScriptTestsPF.cpp
diff --git a/src/unit_tests/generatedScriptTestsPF/main_generatedScriptTestsPF.cpp b/src/unit_tests/generatedScriptTestsPF/main_generatedScriptTestsPF.cpp
index b25ef3b00..28fbb8fd6 100644
--- a/src/unit_tests/generatedScriptTestsPF/main_generatedScriptTestsPF.cpp
+++ b/src/unit_tests/generatedScriptTestsPF/main_generatedScriptTestsPF.cpp
@@ -47,7 +47,6 @@ int main(int argc, char **argv)
     QApplication app(argc, argv, false);
 
     // compilers always write file names into manifest in Utf8
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("Utf8"));
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8"));
 
     init(argv);
diff --git a/src/unit_tests/generatedScriptTestsSecuwall/generatedScriptTestsSecuwall.pro b/src/unit_tests/generatedScriptTestsSecuwall/generatedScriptTestsSecuwall.pro
index e54152c48..ed21379ec 100644
--- a/src/unit_tests/generatedScriptTestsSecuwall/generatedScriptTestsSecuwall.pro
+++ b/src/unit_tests/generatedScriptTestsSecuwall/generatedScriptTestsSecuwall.pro
@@ -1,5 +1,5 @@
 include(../tests_common.pri)
-QT += gui network
+QT += gui widgets printsupport network
 HEADERS = generatedScriptTestsSecuwall.h
 SOURCES = main_generatedScriptTestsSecuwall.cpp \
 	  generatedScriptTestsSecuwall.cpp
diff --git a/src/unit_tests/generatedScriptTestsSecuwall/main_generatedScriptTestsSecuwall.cpp b/src/unit_tests/generatedScriptTestsSecuwall/main_generatedScriptTestsSecuwall.cpp
index 05474f9e3..c63e53ea5 100644
--- a/src/unit_tests/generatedScriptTestsSecuwall/main_generatedScriptTestsSecuwall.cpp
+++ b/src/unit_tests/generatedScriptTestsSecuwall/main_generatedScriptTestsSecuwall.cpp
@@ -37,7 +37,6 @@ int main(int argc, char **argv)
     QApplication app(argc, argv, false);
 
     // compilers always write file names into manifest in Utf8
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("Utf8"));
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8"));
 
     init(argv);
diff --git a/src/unit_tests/genericDialogTest/genericDialogTest.cpp b/src/unit_tests/genericDialogTest/genericDialogTest.cpp
index 53028fc88..6e187c5c4 100644
--- a/src/unit_tests/genericDialogTest/genericDialogTest.cpp
+++ b/src/unit_tests/genericDialogTest/genericDialogTest.cpp
@@ -25,12 +25,12 @@
 
 #include "genericDialogTest.h"
 
-#include "../../../../config.h"
+#include "../../../config.h"
 //#include "../../global.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 #include <QTest>
 #include <iostream>
 
diff --git a/src/unit_tests/genericDialogTest/genericDialogTest.pro b/src/unit_tests/genericDialogTest/genericDialogTest.pro
index c18e919c0..fd727944a 100644
--- a/src/unit_tests/genericDialogTest/genericDialogTest.pro
+++ b/src/unit_tests/genericDialogTest/genericDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = genericDialogTest
 SOURCES += main_genericDialogTest.cpp \
     genericDialogTest.cpp
diff --git a/src/unit_tests/instDialogClusterTest/instDialogClusterTest.pro b/src/unit_tests/instDialogClusterTest/instDialogClusterTest.pro
index 03097edb7..5c1aa488f 100644
--- a/src/unit_tests/instDialogClusterTest/instDialogClusterTest.pro
+++ b/src/unit_tests/instDialogClusterTest/instDialogClusterTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = instDialogClusterTest
 SOURCES += main_instDialogClusterTest.cpp \
            instDialogClusterTest.cpp
diff --git a/src/unit_tests/instDialogCompileTest/instDialogCompileTest.pro b/src/unit_tests/instDialogCompileTest/instDialogCompileTest.pro
index f0848a0c6..8a3f87c8f 100644
--- a/src/unit_tests/instDialogCompileTest/instDialogCompileTest.pro
+++ b/src/unit_tests/instDialogCompileTest/instDialogCompileTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = instDialogCompileTest
 SOURCES += main_instDialogCompileTest.cpp \
     instDialogCompileTest.cpp
diff --git a/src/unit_tests/instDialogInspectTest/instDialogInspectTest.pro b/src/unit_tests/instDialogInspectTest/instDialogInspectTest.pro
index 54000e3bb..a290b69f2 100644
--- a/src/unit_tests/instDialogInspectTest/instDialogInspectTest.pro
+++ b/src/unit_tests/instDialogInspectTest/instDialogInspectTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = instDialogInspectTest
 SOURCES += main_instDialogInspectTest.cpp \
     instDialogInspectTest.cpp
diff --git a/src/unit_tests/instDialogInstallTest/instDialogInstallTest.pro b/src/unit_tests/instDialogInstallTest/instDialogInstallTest.pro
index e77d72b94..f36e26a64 100644
--- a/src/unit_tests/instDialogInstallTest/instDialogInstallTest.pro
+++ b/src/unit_tests/instDialogInstallTest/instDialogInstallTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = instDialogInstallTest
 SOURCES += main_instDialogInstallTest.cpp \
     instDialogInstallTest.cpp
diff --git a/src/unit_tests/instDialogObjectListTest/instDialogObjectListTest.pro b/src/unit_tests/instDialogObjectListTest/instDialogObjectListTest.pro
index c6c729e11..2b55ad292 100644
--- a/src/unit_tests/instDialogObjectListTest/instDialogObjectListTest.pro
+++ b/src/unit_tests/instDialogObjectListTest/instDialogObjectListTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = instDialogObjectListTest
 SOURCES += main_instDialogObjectListTest.cpp \
     instDialogObjectListTest.cpp
diff --git a/src/unit_tests/main/main.pro b/src/unit_tests/main/main.pro
index e0b531b6d..7b3c721fd 100644
--- a/src/unit_tests/main/main.pro
+++ b/src/unit_tests/main/main.pro
@@ -26,7 +26,7 @@ DEPENDPATH += ../../.. \
 	../../compiler_lib \
 	../../common
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 
 TEMPLATE = lib
 
diff --git a/src/unit_tests/newClusterDialogTest/newClusterDialogTest.cpp b/src/unit_tests/newClusterDialogTest/newClusterDialogTest.cpp
index 6b945ef0d..3d4af728e 100644
--- a/src/unit_tests/newClusterDialogTest/newClusterDialogTest.cpp
+++ b/src/unit_tests/newClusterDialogTest/newClusterDialogTest.cpp
@@ -132,7 +132,7 @@ void newClusterDialogTest::test1()
     for (int i=1; i<dialog->getUi()->interfaceEditor->count(); i++)
         dynamic_cast<InterfaceEditorWidget*>(dialog->getUi()->interfaceEditor->widget(i))->setProtocolIndex(2);
 
-    InterfaceEditorWidget* eth0 = qFindChild<InterfaceEditorWidget*>(dialog->getUi()->interfaceEditor, "eth0_widget");
+    InterfaceEditorWidget* eth0 = dialog->getUi()->interfaceEditor->findChild<InterfaceEditorWidget*>("eth0_widget");
     eth0->setProtocolIndex(0);
     eth0->addNewAddress("123.45.67.89", "24", true);
 
@@ -168,7 +168,7 @@ void newClusterDialogTest::test1()
     }
 
     dialog->getUi()->interfaceEditor->setCurrentIndex(1);
-    InterfaceEditorWidget* eth1 = qFindChild<InterfaceEditorWidget*>(dialog->getUi()->interfaceEditor, "eth1_widget");
+    InterfaceEditorWidget* eth1 = dialog->getUi()->interfaceEditor->findChild<InterfaceEditorWidget*>("eth1_widget");
     eth1->setProtocolIndex(0);
     QTableWidget *addrs = eth1->findChild<QTableWidget*>("addresses");
     QVERIFY(addrs != NULL);
diff --git a/src/unit_tests/newClusterDialogTest/newClusterDialogTest.pro b/src/unit_tests/newClusterDialogTest/newClusterDialogTest.pro
index e8a7fa7dc..abebc68b7 100644
--- a/src/unit_tests/newClusterDialogTest/newClusterDialogTest.pro
+++ b/src/unit_tests/newClusterDialogTest/newClusterDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = newClusterDialogTest
 SOURCES += main_newClusterDialogTest.cpp \
     newClusterDialogTest.cpp
diff --git a/src/unit_tests/parseCommandLineTest/parseCommandLineTest.cpp b/src/unit_tests/parseCommandLineTest/parseCommandLineTest.cpp
index 8004703f6..69875269c 100644
--- a/src/unit_tests/parseCommandLineTest/parseCommandLineTest.cpp
+++ b/src/unit_tests/parseCommandLineTest/parseCommandLineTest.cpp
@@ -28,9 +28,9 @@
 #include "config.h"
 #include "utils.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <QApplication>
+#include <QFile>
+#include <QTextStream>
 
 #include <iostream>
 
diff --git a/src/unit_tests/parseCommandLineTest/parseCommandLineTest.pro b/src/unit_tests/parseCommandLineTest/parseCommandLineTest.pro
index 0578de4f1..036c00b0b 100644
--- a/src/unit_tests/parseCommandLineTest/parseCommandLineTest.pro
+++ b/src/unit_tests/parseCommandLineTest/parseCommandLineTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += gui network
+QT += gui widgets printsupport network
 
 HEADERS	+= parseCommandLineTest.h
 SOURCES	+= main_parseCommandLineTest.cpp parseCommandLineTest.cpp
diff --git a/src/unit_tests/startTipDialogTest/startTipDialogTest.h b/src/unit_tests/startTipDialogTest/startTipDialogTest.h
index 29eb44cdf..3d4b2ed10 100644
--- a/src/unit_tests/startTipDialogTest/startTipDialogTest.h
+++ b/src/unit_tests/startTipDialogTest/startTipDialogTest.h
@@ -26,7 +26,7 @@
 #ifndef FWWINDOWTEST_H
 #define FWWINDOWTEST_H
 
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 #include <QTest>
 #include <QMessageBox>
 
diff --git a/src/unit_tests/startTipDialogTest/startTipDialogTest.pro b/src/unit_tests/startTipDialogTest/startTipDialogTest.pro
index 92dd4f939..c2cdf7001 100644
--- a/src/unit_tests/startTipDialogTest/startTipDialogTest.pro
+++ b/src/unit_tests/startTipDialogTest/startTipDialogTest.pro
@@ -1,6 +1,6 @@
 include(../tests_common.pri)
 
-QT += testlib network gui
+QT += testlib network gui widgets printsupport
 TARGET = startTipDialogTest
 HEADERS += startTipDialogTest.h
 SOURCES += main_startTipDialogTest.cpp \
diff --git a/src/unit_tests/tests_common.pri b/src/unit_tests/tests_common.pri
index 023598b4b..8351cdfea 100644
--- a/src/unit_tests/tests_common.pri
+++ b/src/unit_tests/tests_common.pri
@@ -23,6 +23,7 @@ INCLUDEPATH += ../../.. \
                ../../iptlib \
                ../../pflib \
                ../../cisco_lib \
+               ../../juniper_lib \
                ../../libfwbuilder/src
 
 DEPENDPATH  += ../../.. \
@@ -36,6 +37,7 @@ DEPENDPATH  += ../../.. \
                ../../iptlib \
                ../../pflib \
                ../../cisco_lib \
+               ../../juniper_lib \
                ../../libfwbuilder/src
 
 run_tests.commands = echo "Running tests..."; ./${TARGET}
@@ -52,6 +54,7 @@ DEPENDPATH = ../../common \
     ../../iptlib \
     ../../pflib \
     ../../cisco_lib/ \
+    ../../juniper_lib/ \
     ../../compiler_lib \
     ../../libgui \
     ../../libfwbuilder/src/fwbuilder \
@@ -65,6 +68,7 @@ STATIC_LIBS += \
     ../../iptlib/libiptlib.a \
     ../../pflib/libfwbpf.a \
     ../../cisco_lib/libfwbcisco.a \
+    ../../juniper_lib/libfwbjuniper.a \
     ../../compiler_lib/libcompilerdriver.a \
     ../../libfwbuilder/src/fwcompiler/libfwcompiler.a \
     ../../libfwbuilder/src/fwbuilder/libfwbuilder.a \
@@ -77,6 +81,7 @@ PRE_TARGETDEPS += ../../common/libcommon.a \
     ../../iptlib/libiptlib.a \
     ../../pflib/libfwbpf.a \
     ../../cisco_lib/libfwbcisco.a \
+    ../../juniper_lib/libfwbjuniper.a \
     ../../compiler_lib/libcompilerdriver.a \
     ../../parsers/libfwbparser.a \
     ../../import/libimport.a \