dnssec-tools-qt.patch

   1 --- dnssec-tools-2.1/validator/apps/dnssec-check/qmlapplicationviewer/qmlapplicationviewer.pri.orig     2015-06-28 17:29:18.722892362 +0200
   2 +++ dnssec-tools-2.1/validator/apps/dnssec-check/qmlapplicationviewer/qmlapplicationviewer.pri  2015-06-28 18:09:04.399458910 +0200
   3 @@ -155,7 +155,7 @@
   4      !isEmpty(target.path) {
   5          installPrefix = $${target.path}
   6      } else {
   7 -        installPrefix = /opt/$${TARGET}
   8 +        installPrefix = /usr
   9      }
  10      for(deploymentfolder, DEPLOYMENTFOLDERS) {
  11          item = item$${deploymentfolder}
  12 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/dnssec-nodes.pro.orig  2014-08-15 22:20:16.000000000 +0200
  13 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/dnssec-nodes.pro       2015-06-28 18:13:19.206114883 +0200
  14 @@ -1,3 +1,4 @@
  15 +PREFIX=/usr
  16  HEADERS += \
  17          edge.h \
  18          node.h \
  19 @@ -70,7 +71,7 @@
  20  isEmpty(ANDROID_PLATFORM) {
  21      QMAKE_LIBDIR     += ../../libval/.libs
  22      QMAKE_LIBDIR     += ../../libsres/.libs
  23 -    LIBS        += -lval-threads -lsres -lnsl -lcrypto -lssl -lpthread
  24 +    LIBS        += -lval-threads -lsres -lcrypto -lpthread
  25      contains(MEEGO_EDITION,harmattan): {
  26          QMAKE_LIBDIR += /scratchbox/users/hardaker/targets/HARMATTAN_ARMEL/usr/lib
  27      } else:osx {
  28 @@ -93,8 +94,6 @@
  29  # path to the harmattan libraries
  30  contains(MEEGO_EDITION,harmattan): {
  31      LIBS += -L/scratchbox/users/hardaker/targets/HARMATTAN_ARMEL/usr/lib
  32 -} else {
  33 -    LIBS += -L/usr/local/lib
  34  }
  35
  36  QT += network widgets core
  37 --- dnssec-tools-1.13/validator/apps/dnssec-system-tray/dnssec-system-tray.pro.orig     2011-10-25 22:45:08.000000000 +0200
  38 +++ dnssec-tools-1.13/validator/apps/dnssec-system-tray/dnssec-system-tray.pro  2012-06-30 12:17:05.175285379 +0200
  39 @@ -1,3 +1,4 @@
  40 +PREFIX=/usr
  41  TARGET=dnssec-system-tray
  42
  43  HEADERS       = dnssec-system-tray.h \
  44 --- dnssec-tools-2.0/validator/apps/lookup/src/src.pro.orig     2013-02-20 23:33:14.000000000 +0100
  45 +++ dnssec-tools-2.0/validator/apps/lookup/src/src.pro  2013-03-01 22:10:35.688684940 +0100
  46 @@ -11,7 +11,7 @@
  47  INCLUDEPATH += /home/hardaker/src/dnssec/dnssec-tools.git/dnssec-tools/validator/include
  48
  49  isEmpty(ANDROID_PLATFORM) {
  50 -    LIBS        += -lval-threads -lsres -lnsl -lssl -lcrypto -lpthread
  51 +    LIBS        += -L../../../libval/.libs -L../../../libsres/.libs -lval-threads -lsres -lcrypto -lpthread
  52  } else {
  53      LIBS        += -L/opt/android-external-openssl/lib/
  54      LIBS        += -L/root/necessitas/android-ndk-r5c/platforms/android-4/arch-arm/usr/lib/
  55 @@ -63,7 +63,7 @@
  56  unix {
  57      #VARIABLES
  58      isEmpty(PREFIX) {
  59 -        PREFIX = /usr/local
  60 +        PREFIX = /usr
  61      }
  62
  63  BINDIR = $$PREFIX/bin
  64 @@ -77,13 +77,13 @@
  65
  66    target.path =$$BINDIR
  67
  68 -  desktop.path = $$DATADIR/applications/hildon
  69 +  desktop.path = $$DATADIR/applications
  70    desktop.files += $${TARGET}.desktop
  71
  72    service.path = $$DATADIR/dbus-1/services
  73    service.files += $${TARGET}.service
  74
  75 -  iconxpm.path = $$DATADIR/pixmap
  76 +  iconxpm.path = $$DATADIR/pixmaps
  77    iconxpm.files += ../data/maemo/$${TARGET}.xpm
  78
  79    icon26.path = $$DATADIR/icons/hicolor/26x26/apps
  80 --- dnssec-tools-2.1/validator/apps/dnssec-check/DnssecCheckVersion.h.orig      2014-09-05 19:19:50.000000000 +0200
  81 +++ dnssec-tools-2.1/validator/apps/dnssec-check/DnssecCheckVersion.h   2015-06-28 18:52:38.019349227 +0200
  82 @@ -1,6 +1,6 @@
  83  #ifndef DNSSECCHECKVERSION_H
  84  #define DNSSECCHECKVERSION_H
  85
  86 -#define .1"
  87 +#define DNSSEC_CHECK_VERSION "2.1"
  88
  89  #endif // DNSSECCHECKVERSION_H
  90 --- dnssec-tools-2.1/validator/apps/dnssec-check/SubmitDialog.h.orig    2011-10-10 23:14:45.000000000 +0200
  91 +++ dnssec-tools-2.1/validator/apps/dnssec-check/SubmitDialog.h 2015-06-28 20:54:41.575708553 +0200
  92 @@ -2,7 +2,7 @@
  93  #define SUBMITDIALOG_H
  94
  95  #include <QDialog>
  96 -#include <QtGui/QVBoxLayout>
  97 -#include <QtGui/QLineEdit>
  98 +#include <QtWidgets/QVBoxLayout>
  99 +#include <QtWidgets/QLineEdit>
 100
 101  class SubmitDialog : public QDialog
 102 --- dnssec-tools-2.1/validator/apps/dnssec-check/SubmitDialog.cpp.orig  2011-10-10 23:14:45.000000000 +0200
 103 +++ dnssec-tools-2.1/validator/apps/dnssec-check/SubmitDialog.cpp       2015-06-28 21:05:45.832347343 +0200
 104 @@ -1,7 +1,7 @@
 105  #include "SubmitDialog.h"
 106
 107 -#include <QtGui/QLabel>
 108 -#include <QtGui/QDialogButtonBox>
 109 +#include <QtWidgets/QLabel>
 110 +#include <QtWidgets/QDialogButtonBox>
 111
 112  SubmitDialog::SubmitDialog(QWidget *parent) :
 113      QDialog(parent)
 114 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/node.h.orig    2013-02-15 02:22:03.000000000 +0100
 115 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/node.h 2015-06-28 21:12:46.145663038 +0200
 116 @@ -41,7 +41,7 @@
 117  #ifndef NODE_H
 118  #define NODE_H
 119
 120 -#include <QtGui/QGraphicsItem>
 121 +#include <QtWidgets/QGraphicsItem>
 122  #include <QtCore/QList>
 123  #include <QtCore/QSet>
 124
 125 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/TypeMenu.h.orig        2011-10-06 07:54:18.000000000 +0200
 126 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/TypeMenu.h     2015-06-28 21:29:20.215621321 +0200
 127 @@ -2,9 +2,9 @@
 128  #define TYPEMENU_H
 129
 130  #include <QObject>
 131 -#include <QtGui/QMenu>
 132 +#include <QtWidgets/QMenu>
 133  #include <QtCore/QSignalMapper>
 134 -#include <QtGui/QPushButton>
 135 +#include <QtWidgets/QPushButton>
 136
 137  class TypeMenu : public QObject
 138  {
 139 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/MainWindow.h.orig      2013-02-14 15:41:49.000000000 +0100
 140 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/MainWindow.h   2015-06-29 16:45:19.232710599 +0200
 141 @@ -2,10 +2,10 @@
 142  #define MAINWINDOW_H
 143
 144  #include <QMainWindow>
 145 -#include <QtGui/QVBoxLayout>
 146 -#include <QtGui/QLineEdit>
 147 -#include <QtGui/QMenuBar>
 148 -#include <QtGui/QTabWidget>
 149 +#include <QtWidgets/QVBoxLayout>
 150 +#include <QtWidgets/QLineEdit>
 151 +#include <QtWidgets/QMenuBar>
 152 +#include <QtWidgets/QTabWidget>
 153
 154  #include "graphwidget.h"
 155  #include "TypeMenu.h"
 156 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/DetailsViewer.h.orig   2012-10-11 23:01:57.000000000 +0200
 157 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/DetailsViewer.h        2015-06-29 16:56:22.182682775 +0200
 158 @@ -3,11 +3,11 @@
 159
 160  #include <QDialog>
 161  #include <QObject>
 162 -#include <QtGui/QVBoxLayout>
 163 -#include <QtGui/QDialogButtonBox>
 164 +#include <QtWidgets/QVBoxLayout>
 165 +#include <QtWidgets/QDialogButtonBox>
 166  #include <QtCore/QSignalMapper>
 167 -#include <QtGui/QTabWidget>
 168 -#include <QtGui/QTableWidgetItem>
 169 +#include <QtWidgets/QTabWidget>
 170 +#include <QtWidgets/QTableWidgetItem>
 171  #include "node.h"
 172  #include <QLabel>
 173
 174 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/Filter.h.orig  2013-02-14 15:43:03.000000000 +0100
 175 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/Filter.h       2015-06-29 17:03:45.735997496 +0200
 176 @@ -2,7 +2,7 @@
 177  #define FILTER_H
 178
 179  #include <QObject>
 180 -#include <QtGui/QHBoxLayout>
 181 +#include <QtWidgets/QHBoxLayout>
 182
 183  #include "node.h"
 184  #include <qdebug.h>
 185 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/DNSSECStatusFilter.h.orig      2013-02-14 15:43:03.000000000 +0100
 186 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/DNSSECStatusFilter.h   2015-06-29 17:12:13.345976194 +0200
 187 @@ -5,7 +5,7 @@
 188  #include "node.h"
 189
 190  #include <QtCore/QSignalMapper>
 191 -#include <QtGui/QPushButton>
 192 +#include <QtWidgets/QPushButton>
 193
 194  class DNSSECStatusFilter : public Filter
 195  {
 196 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/TypeFilter.h.orig      2013-02-14 15:43:03.000000000 +0100
 197 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/TypeFilter.h   2015-06-29 17:53:46.785871554 +0200
 198 @@ -4,7 +4,7 @@
 199  #include "Filter.h"
 200  #include "TypeMenu.h"
 201
 202 -#include <QtGui/QPushButton>
 203 +#include <QtWidgets/QPushButton>
 204  #include <QtCore/QSignalMapper>
 205
 206  class TypeFilter : public Filter
 207 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/NodeList.h.orig        2013-02-14 15:43:03.000000000 +0100
 208 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/NodeList.h     2015-06-29 18:07:30.795836973 +0200
 209 @@ -10,7 +10,7 @@
 210  #include "Filters/Filter.h"
 211  #include "FilterEditorWindow.h"
 212
 213 -#include <QtGui/QHBoxLayout>
 214 +#include <QtWidgets/QHBoxLayout>
 215
 216  class GraphWidget;
 217  class DNSData;
 218 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/NodesPreferences.h.orig        2011-09-23 19:54:13.000000000 +0200
 219 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/NodesPreferences.h     2015-06-29 18:42:27.702415642 +0200
 220 @@ -2,11 +2,11 @@
 221  #define NODESPREFERENCES_H
 222
 223  #include <QDialog>
 224 -#include <QtGui/QVBoxLayout>
 225 -#include <QtGui/QFormLayout>
 226 -#include <QtGui/QSpinBox>
 227 +#include <QtWidgets/QVBoxLayout>
 228 +#include <QtWidgets/QFormLayout>
 229 +#include <QtWidgets/QSpinBox>
 230  #include <QtCore/QSettings>
 231 -#include <QtGui/QCheckBox>
 232 +#include <QtWidgets/QCheckBox>
 233
 234  class NodesPreferences : public QDialog
 235  {
 236 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/LogFilePicker.h.orig   2011-10-07 16:23:49.000000000 +0200
 237 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/LogFilePicker.h        2015-06-29 19:20:40.992319401 +0200
 238 @@ -2,11 +2,11 @@
 239  #define LOGFILEPICKER_H
 240
 241  #include <QDialog>
 242 -#include <QtGui/QHBoxLayout>
 243 -#include <QtGui/QVBoxLayout>
 244 -#include <QtGui/QLineEdit>
 245 +#include <QtWidgets/QHBoxLayout>
 246 +#include <QtWidgets/QVBoxLayout>
 247 +#include <QtWidgets/QLineEdit>
 248  #include <QtCore/QString>
 249 -#include <QtGui/QCheckBox>
 250 +#include <QtWidgets/QCheckBox>
 251
 252  class LogFilePicker : public QDialog
 253  {
 254 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/NodesPreferences.cpp.orig      2011-09-23 19:54:13.000000000 +0200
 255 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/NodesPreferences.cpp   2015-06-29 19:30:12.122295433 +0200
 256 @@ -1,6 +1,6 @@
 257  #include "NodesPreferences.h"
 258
 259 -#include <QtGui/QDialogButtonBox>
 260 +#include <QtWidgets/QDialogButtonBox>
 261
 262  NodesPreferences::NodesPreferences(QSettings *settings, QWidget *parent) :
 263      QDialog(parent), m_settings(settings)
 264 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/DetailsViewer.cpp.orig 2014-08-15 22:20:16.000000000 +0200
 265 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/DetailsViewer.cpp      2015-06-29 20:04:58.995541190 +0200
 266 @@ -1,17 +1,17 @@
 267  #include "DetailsViewer.h"
 268
 269  #define QT_NO_PRINTER
 270 -#include <QtGui/QLabel>
 271 -#include <QtGui/QTextEdit>
 272 +#include <QtWidgets/QLabel>
 273 +#include <QtWidgets/QTextEdit>
 274  #include <QtGui/QFont>
 275 -#include <QtGui/QFormLayout>
 276 +#include <QtWidgets/QFormLayout>
 277  #include <QtGui/QStandardItemModel>
 278 -#include <QtGui/QTableView>
 279 -#include <QtGui/QTableWidget>
 280 -#include <QtGui/QHeaderView>
 281 +#include <QtWidgets/QTableView>
 282 +#include <QtWidgets/QTableWidget>
 283 +#include <QtWidgets/QHeaderView>
 284  #include <QtGui/QIcon>
 285  #include <QtGui/QPainter>
 286 -#include <QtGui/QPushButton>
 287 +#include <QtWidgets/QPushButton>
 288
 289  #include "ValidateViewWidgetHolder.h"
 290
 291 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/DNSSECStatusFilter.cpp.orig    2013-02-14 15:43:03.000000000 +0100
 292 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/DNSSECStatusFilter.cpp 2015-06-29 20:55:45.965413320 +0200
 293 @@ -1,7 +1,7 @@
 294  #include "DNSSECStatusFilter.h"
 295
 296 -#include <QtGui/QMenu>
 297 -#include <QtGui/QLabel>
 298 +#include <QtWidgets/QMenu>
 299 +#include <QtWidgets/QLabel>
 300
 301  DNSSECStatusFilter::DNSSECStatusFilter(int dnssecValitiy, bool requireAll)
 302      : Filter(), m_dnssecValidity(dnssecValitiy), m_requireAll(requireAll), m_mapper(), m_menuButton(0)
 303 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/NameFilter.cpp.orig    2013-02-14 19:01:09.000000000 +0100
 304 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/NameFilter.cpp 2015-06-29 21:30:57.028658061 +0200
 305 @@ -1,7 +1,7 @@
 306  #include "NameFilter.h"
 307
 308 -#include <QtGui/QLabel>
 309 -#include <QtGui/QLineEdit>
 310 +#include <QtWidgets/QLabel>
 311 +#include <QtWidgets/QLineEdit>
 312  #include <qdebug.h>
 313
 314  NameFilter::NameFilter(const QString &searchName, QObject *parent)
 315 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/TypeFilter.cpp.orig    2013-02-14 15:43:03.000000000 +0100
 316 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/TypeFilter.cpp 2015-06-29 21:36:20.908644468 +0200
 317 @@ -1,7 +1,7 @@
 318  #include "TypeFilter.h"
 319
 320 -#include <QtGui/QLabel>
 321 -#include <QtGui/QMenu>
 322 +#include <QtWidgets/QLabel>
 323 +#include <QtWidgets/QMenu>
 324
 325  #include <qdebug.h>
 326
 327 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/LogFilePicker.cpp.orig 2011-10-07 16:23:49.000000000 +0200
 328 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/LogFilePicker.cpp      2015-06-29 21:43:27.271959910 +0200
 329 @@ -1,10 +1,10 @@
 330  #include "LogFilePicker.h"
 331
 332 -#include <QtGui/QLabel>
 333 -#include <QtGui/QPushButton>
 334 -#include <QtGui/QCheckBox>
 335 -#include <QtGui/QDialogButtonBox>
 336 -#include <QtGui/QFileDialog>
 337 +#include <QtWidgets/QLabel>
 338 +#include <QtWidgets/QPushButton>
 339 +#include <QtWidgets/QCheckBox>
 340 +#include <QtWidgets/QDialogButtonBox>
 341 +#include <QtWidgets/QFileDialog>
 342
 343  LogFilePicker::LogFilePicker(QString defaultFile, QWidget *parent) :
 344      QDialog(parent)
 345 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Legend.cpp.orig        2012-10-25 06:36:17.000000000 +0200
 346 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Legend.cpp     2015-06-29 21:52:30.241937125 +0200
 347 @@ -1,14 +1,14 @@
 348  #include "Legend.h"
 349
 350 -#include <QtGui/QVBoxLayout>
 351 -#include <QtGui/QLabel>
 352 -#include <QtGui/QDialogButtonBox>
 353 +#include <QtWidgets/QVBoxLayout>
 354 +#include <QtWidgets/QLabel>
 355 +#include <QtWidgets/QDialogButtonBox>
 356  #include <QTableWidget>
 357  #include <QtGui/QPainter>
 358  #include <QtGui/QPixmap>
 359  #include <QtGui/QIcon>
 360 -#include <QtGui/QTableWidgetItem>
 361 -#include <QtGui/QHeaderView>
 362 +#include <QtWidgets/QTableWidgetItem>
 363 +#include <QtWidgets/QHeaderView>
 364
 365  #include <qdebug.h>
 366
 367 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/MainWindow.cpp.orig    2013-02-15 22:41:19.000000000 +0100
 368 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/MainWindow.cpp 2015-06-29 21:53:47.315267221 +0200
 369 @@ -1,6 +1,6 @@
 370  #include "MainWindow.h"
 371
 372 -#include <QtGui/QMessageBox>
 373 +#include <QtWidgets/QMessageBox>
 374
 375  #include "NodeList.h"
 376  #include "LogWatcher.h"
 377 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/FilterEditorWindow.cpp.orig    2013-02-14 15:43:03.000000000 +0100
 378 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/FilterEditorWindow.cpp 2015-06-29 21:54:30.511932075 +0200
 379 @@ -1,8 +1,8 @@
 380  #include "FilterEditorWindow.h"
 381
 382 -#include <QtGui/QLabel>
 383 -#include <QtGui/QDialogButtonBox>
 384 -#include <QtGui/QGroupBox>
 385 +#include <QtWidgets/QLabel>
 386 +#include <QtWidgets/QDialogButtonBox>
 387 +#include <QtWidgets/QGroupBox>
 388
 389  FilterEditorWindow::FilterEditorWindow(NodeList *nodeList, QWidget *parent) :
 390      QDialog(parent), m_nodeList(nodeList)
 391 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/PcapWatcher.cpp.orig   2014-08-15 22:20:16.000000000 +0200
 392 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/PcapWatcher.cpp        2015-06-30 18:03:22.995554842 +0200
 393 @@ -10,7 +10,7 @@
 394  #ifndef __MINGW_GCC
 395  #include <arpa/inet.h>
 396  #endif /* ! __MINGW_GCC */
 397 -#include <QtGui/QAction>
 398 +#include <QtWidgets/QAction>
 399  #include <QFileDialog>
 400
 401  typedef u_int32_t tcp_seq;
 402 --- dnssec-tools-2.1/validator/apps/dnssec-system-tray/dnssec-system-tray.h.orig        2014-08-28 20:26:59.000000000 +0200
 403 +++ dnssec-tools-2.1/validator/apps/dnssec-system-tray/dnssec-system-tray.h     2015-06-30 21:06:15.311761043 +0200
 404 @@ -45,10 +45,10 @@
 405
 406  #include <QSystemTrayIcon>
 407  #include <QDialog>
 408 -#include <QtGui/QVBoxLayout>
 409 -#include <QtGui/QLabel>
 410 +#include <QtWidgets/QVBoxLayout>
 411 +#include <QtWidgets/QLabel>
 412  #include <QtGui/QIcon>
 413 -#include <QtGui/QTableWidget>
 414 +#include <QtWidgets/QTableWidget>
 415  #include <QtCore/QFile>
 416  #include <QtCore/QTextStream>
 417  #include <QtCore/QRegExp>
 418 @@ -56,7 +56,7 @@
 419  #include <QtGui/QIcon>
 420  #include <QtCore/QMap>
 421  #include <QtCore/QDateTime>
 422 -#include <QtGui/QMainWindow>
 423 +#include <QtWidgets/QMainWindow>
 424
 425  class DNSTrayData {
 426  public:
 427 --- dnssec-tools-2.1/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.h.orig     2014-08-28 20:26:59.000000000 +0200
 428 +++ dnssec-tools-2.1/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.h  2015-07-01 16:07:25.758887612 +0200
 429 @@ -4,12 +4,12 @@
 430  #define QT_NO_PRINTER
 431
 432  #include <QDialog>
 433 -#include <QtGui/QVBoxLayout>
 434 -#include <QtGui/QFormLayout>
 435 -#include <QtGui/QLineEdit>
 436 -#include <QtGui/QSpinBox>
 437 -#include <QtGui/QCheckBox>
 438 -#include <QtGui/QTextEdit>
 439 +#include <QtWidgets/QVBoxLayout>
 440 +#include <QtWidgets/QFormLayout>
 441 +#include <QtWidgets/QLineEdit>
 442 +#include <QtWidgets/QSpinBox>
 443 +#include <QtWidgets/QCheckBox>
 444 +#include <QtWidgets/QTextEdit>
 445
 446  class DnssecSystemTrayPrefs : public QDialog
 447  {
 448 --- dnssec-tools-2.1/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.cpp.orig   2012-01-20 19:53:52.000000000 +0100
 449 +++ dnssec-tools-2.1/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.cpp        2015-07-01 16:08:09.728885767 +0200
 450 @@ -1,10 +1,10 @@
 451  #include "DnssecSystemTrayPrefs.h"
 452
 453  #include <QtCore/QSettings>
 454 -#include <QtGui/QDialogButtonBox>
 455 -#include <QtGui/QPushButton>
 456 -#include <QtGui/QFileDialog>
 457 -#include <QtGui/QLabel>
 458 +#include <QtWidgets/QDialogButtonBox>
 459 +#include <QtWidgets/QPushButton>
 460 +#include <QtWidgets/QFileDialog>
 461 +#include <QtWidgets/QLabel>
 462  #include <QtGui/QFont>
 463
 464  DnssecSystemTrayPrefs::DnssecSystemTrayPrefs(QWidget *parent) :
 465 --- dnssec-tools-2.1/validator/apps/lookup/src/qtmain.cpp.orig  2014-08-26 19:09:59.000000000 +0200
 466 +++ dnssec-tools-2.1/validator/apps/lookup/src/qtmain.cpp       2015-07-01 16:42:27.378799415 +0200
 467 @@ -3,8 +3,8 @@
 468   * Author: hardaker
 469   */
 470  #include <QWidget>
 471 -#include <QtGui/QApplication>
 472 -#include <QtGui/QPushButton>
 473 +#include <QtWidgets/QApplication>
 474 +#include <QtWidgets/QPushButton>
 475
 476  #include "lookup.h"
 477
 478 --- dnssec-tools-2.1/validator/apps/lookup/src/QDNSItemModel.h.orig     2011-05-18 22:15:55.000000000 +0200
 479 +++ dnssec-tools-2.1/validator/apps/lookup/src/QDNSItemModel.h  2015-07-01 16:43:11.965464211 +0200
 480 @@ -1,7 +1,7 @@
 481  #ifndef QDNSITEMMODEL_H
 482  #define QDNSITEMMODEL_H
 483
 484 -#include <QtGui/QWidget>
 485 +#include <QtWidgets/QWidget>
 486  #include <QtGui/QStandardItemModel>
 487
 488  #if (defined(Q_WS_MAEMO_5) || defined(MAEMO_CHANGES))
 489 --- dnssec-tools-2.1/validator/apps/lookup/src/LookupPrefs.h.orig       2014-08-26 19:09:59.000000000 +0200
 490 +++ dnssec-tools-2.1/validator/apps/lookup/src/LookupPrefs.h    2015-07-01 16:43:40.142129695 +0200
 491 @@ -2,9 +2,9 @@
 492  #define LOOKUPPREFS_H
 493
 494  #include <QDialog>
 495 -#include <QtGui/QVBoxLayout>
 496 -#include <QtGui/QFormLayout>
 497 -#include <QtGui/QLineEdit>
 498 +#include <QtWidgets/QVBoxLayout>
 499 +#include <QtWidgets/QFormLayout>
 500 +#include <QtWidgets/QLineEdit>
 501  #include <QWidget>
 502
 503  class LookupPrefs : public QDialog
 504 --- dnssec-tools-2.1/validator/apps/lookup/src/LookupPrefs.cpp.orig     2014-08-26 19:09:59.000000000 +0200
 505 +++ dnssec-tools-2.1/validator/apps/lookup/src/LookupPrefs.cpp  2015-07-01 16:47:07.335454333 +0200
 506 @@ -1,7 +1,7 @@
 507  #include <QWidget>
 508  #include "LookupPrefs.h"
 509 -#include <QtGui/QWidget>
 510 -#include <QtGui/QDialogButtonBox>
 511 +#include <QtWidgets/QWidget>
 512 +#include <QtWidgets/QDialogButtonBox>
 513  #include <QtCore/QSettings>
 514  LookupPrefs::LookupPrefs(QWidget *parent) :
 515      QDialog(parent)