test: Make unit tests compile

However, not all tests run.
2026-05-01 14:47:27 +02:00 · 2018-04-19 17:42:28 +02:00 · 2018-04-19 17:42:28 +02:00 · 1b6e8ce7cc
commit 1b6e8ce7cc
parent d31619a572
66 changed files with 122 additions and 119 deletions
--- 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>
--- 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>

--- 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
--- 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>

--- 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
--- 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>

--- 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
--- 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>

--- 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
--- 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>

--- 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
--- 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>

--- 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
--- 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>

--- 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
--- 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>

--- 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
--- 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>

--- 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
--- 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);
--- 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
+        ImporterTest.cpp
--- 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>

--- 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
--- 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>

--- 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
--- 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>

--- 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
--- 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 \
--- 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 \
--- 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>

--- 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 \
--- 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
--- 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
--- 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>

--- 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
--- 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>

--- 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
--- 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>

--- 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
--- 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>

--- 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
--- 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

--- 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);
--- 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

--- 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);
--- 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 \
--- 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);
--- 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
--- 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);
--- 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
--- 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);
--- 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>

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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);
--- 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
--- 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>

--- 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
--- 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>

--- 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 \
--- 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 \