+diff -urNp -x '*.orig' DNSSEC-Tools-dnssec-tools-2.2.3.org/validator/apps/dnssec-nodes/TypeMenu.h DNSSEC-Tools-dnssec-tools-2.2.3/validator/apps/dnssec-nodes/TypeMenu.h
+--- DNSSEC-Tools-dnssec-tools-2.2.3.org/validator/apps/dnssec-nodes/TypeMenu.h 2018-08-30 00:25:30.000000000 +0200
++++ DNSSEC-Tools-dnssec-tools-2.2.3/validator/apps/dnssec-nodes/TypeMenu.h 2021-05-08 10:27:04.212451216 +0200
+@@ -2,9 +2,9 @@
+ #define TYPEMENU_H
+
+ #include <QObject>
+-#include <QtGui/QMenu>
++#include <QtWidgets/QMenu>
+ #include <QtCore/QSignalMapper>
+-#include <QtGui/QPushButton>
++#include <QtWidgets/QPushButton>
+
+ class TypeMenu : public QObject
+ {
+diff -urNp -x '*.orig' DNSSEC-Tools-dnssec-tools-2.2.3.org/validator/apps/dnssec-nodes/dnssec-nodes.pro DNSSEC-Tools-dnssec-tools-2.2.3/validator/apps/dnssec-nodes/dnssec-nodes.pro
+--- DNSSEC-Tools-dnssec-tools-2.2.3.org/validator/apps/dnssec-nodes/dnssec-nodes.pro 2018-08-30 00:25:30.000000000 +0200
++++ DNSSEC-Tools-dnssec-tools-2.2.3/validator/apps/dnssec-nodes/dnssec-nodes.pro 2021-05-08 10:27:04.212451216 +0200
+@@ -1,3 +1,4 @@
++PREFIX=/usr
+ HEADERS += \
+ edge.h \
+ node.h \
+@@ -70,7 +71,7 @@ INCLUDEPATH += ../../include
+ isEmpty(ANDROID_PLATFORM) {
+ QMAKE_LIBDIR += ../../libval/.libs
+ QMAKE_LIBDIR += ../../libsres/.libs
+- LIBS += -lval-threads -lsres -lnsl -lcrypto -lssl -lpthread
++ LIBS += -lval-threads -lsres -lcrypto -lpthread
+ contains(MEEGO_EDITION,harmattan): {
+ QMAKE_LIBDIR += /scratchbox/users/hardaker/targets/HARMATTAN_ARMEL/usr/lib
+ } else:osx {
+@@ -93,8 +94,6 @@ isEmpty(ANDROID_PLATFORM) {
+ # path to the harmattan libraries
+ contains(MEEGO_EDITION,harmattan): {
+ LIBS += -L/scratchbox/users/hardaker/targets/HARMATTAN_ARMEL/usr/lib
+-} else {
+- LIBS += -L/usr/local/lib
+ }
+
+ QT += network widgets core
+diff -urNp -x '*.orig' DNSSEC-Tools-dnssec-tools-2.2.3.org/validator/apps/dnssec-nodes/node.h DNSSEC-Tools-dnssec-tools-2.2.3/validator/apps/dnssec-nodes/node.h
+--- DNSSEC-Tools-dnssec-tools-2.2.3.org/validator/apps/dnssec-nodes/node.h 2018-08-30 00:25:30.000000000 +0200
++++ DNSSEC-Tools-dnssec-tools-2.2.3/validator/apps/dnssec-nodes/node.h 2021-05-08 10:27:04.212451216 +0200
+@@ -41,7 +41,7 @@
+ #ifndef NODE_H
+ #define NODE_H
+
+-#include <QtGui/QGraphicsItem>
++#include <QtWidgets/QGraphicsItem>
+ #include <QtCore/QList>
+ #include <QtCore/QSet>
+
+diff -urNp -x '*.orig' DNSSEC-Tools-dnssec-tools-2.2.3.org/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.cpp DNSSEC-Tools-dnssec-tools-2.2.3/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.cpp
+--- DNSSEC-Tools-dnssec-tools-2.2.3.org/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.cpp 2018-08-30 00:25:30.000000000 +0200
++++ DNSSEC-Tools-dnssec-tools-2.2.3/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.cpp 2021-05-08 10:27:04.215784622 +0200
+@@ -1,10 +1,10 @@
+ #include "DnssecSystemTrayPrefs.h"
+
+ #include <QtCore/QSettings>
+-#include <QtGui/QDialogButtonBox>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QFileDialog>
+-#include <QtGui/QLabel>
++#include <QtWidgets/QDialogButtonBox>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QFileDialog>
++#include <QtWidgets/QLabel>
+ #include <QtGui/QFont>
+
+ DnssecSystemTrayPrefs::DnssecSystemTrayPrefs(QWidget *parent) :
+diff -urNp -x '*.orig' DNSSEC-Tools-dnssec-tools-2.2.3.org/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.h DNSSEC-Tools-dnssec-tools-2.2.3/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.h
+--- DNSSEC-Tools-dnssec-tools-2.2.3.org/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.h 2018-08-30 00:25:30.000000000 +0200
++++ DNSSEC-Tools-dnssec-tools-2.2.3/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.h 2021-05-08 10:27:04.212451216 +0200
+@@ -4,12 +4,12 @@
+ #define QT_NO_PRINTER
+
+ #include <QDialog>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QFormLayout>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QSpinBox>
+-#include <QtGui/QCheckBox>
+-#include <QtGui/QTextEdit>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QFormLayout>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QSpinBox>
++#include <QtWidgets/QCheckBox>
++#include <QtWidgets/QTextEdit>
+
+ class DnssecSystemTrayPrefs : public QDialog
+ {
+diff -urNp -x '*.orig' DNSSEC-Tools-dnssec-tools-2.2.3.org/validator/apps/dnssec-system-tray/dnssec-system-tray.h DNSSEC-Tools-dnssec-tools-2.2.3/validator/apps/dnssec-system-tray/dnssec-system-tray.h
+--- DNSSEC-Tools-dnssec-tools-2.2.3.org/validator/apps/dnssec-system-tray/dnssec-system-tray.h 2018-08-30 00:25:30.000000000 +0200
++++ DNSSEC-Tools-dnssec-tools-2.2.3/validator/apps/dnssec-system-tray/dnssec-system-tray.h 2021-05-08 10:27:04.212451216 +0200