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-nodes/node.h.orig    2013-02-15 02:22:03.000000000 +0100
  81 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/node.h 2015-06-28 21:12:46.145663038 +0200
  82 @@ -41,7 +41,7 @@
  83  #ifndef NODE_H
  84  #define NODE_H
  85
  86 -#include <QtGui/QGraphicsItem>
  87 +#include <QtWidgets/QGraphicsItem>
  88  #include <QtCore/QList>
  89  #include <QtCore/QSet>
  90
  91 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/TypeMenu.h.orig        2011-10-06 07:54:18.000000000 +0200
  92 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/TypeMenu.h     2015-06-28 21:29:20.215621321 +0200
  93 @@ -2,9 +2,9 @@
  94  #define TYPEMENU_H
  95
  96  #include <QObject>
  97 -#include <QtGui/QMenu>
  98 +#include <QtWidgets/QMenu>
  99  #include <QtCore/QSignalMapper>
 100 -#include <QtGui/QPushButton>
 101 +#include <QtWidgets/QPushButton>
 102
 103  class TypeMenu : public QObject
 104  {
 105 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/MainWindow.h.orig      2013-02-14 15:41:49.000000000 +0100
 106 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/MainWindow.h   2015-06-29 16:45:19.232710599 +0200
 107 @@ -2,10 +2,10 @@
 108  #define MAINWINDOW_H
 109
 110  #include <QMainWindow>
 111 -#include <QtGui/QVBoxLayout>
 112 -#include <QtGui/QLineEdit>
 113 -#include <QtGui/QMenuBar>
 114 -#include <QtGui/QTabWidget>
 115 +#include <QtWidgets/QVBoxLayout>
 116 +#include <QtWidgets/QLineEdit>
 117 +#include <QtWidgets/QMenuBar>
 118 +#include <QtWidgets/QTabWidget>
 119
 120  #include "graphwidget.h"
 121  #include "TypeMenu.h"
 122 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/DetailsViewer.h.orig   2012-10-11 23:01:57.000000000 +0200
 123 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/DetailsViewer.h        2015-06-29 16:56:22.182682775 +0200
 124 @@ -3,11 +3,11 @@
 125
 126  #include <QDialog>
 127  #include <QObject>
 128 -#include <QtGui/QVBoxLayout>
 129 -#include <QtGui/QDialogButtonBox>
 130 +#include <QtWidgets/QVBoxLayout>
 131 +#include <QtWidgets/QDialogButtonBox>
 132  #include <QtCore/QSignalMapper>
 133 -#include <QtGui/QTabWidget>
 134 -#include <QtGui/QTableWidgetItem>
 135 +#include <QtWidgets/QTabWidget>
 136 +#include <QtWidgets/QTableWidgetItem>
 137  #include "node.h"
 138  #include <QLabel>
 139
 140 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/Filter.h.orig  2013-02-14 15:43:03.000000000 +0100
 141 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/Filter.h       2015-06-29 17:03:45.735997496 +0200
 142 @@ -2,7 +2,7 @@
 143  #define FILTER_H
 144
 145  #include <QObject>
 146 -#include <QtGui/QHBoxLayout>
 147 +#include <QtWidgets/QHBoxLayout>
 148
 149  #include "node.h"
 150  #include <qdebug.h>
 151 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/DNSSECStatusFilter.h.orig      2013-02-14 15:43:03.000000000 +0100
 152 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/DNSSECStatusFilter.h   2015-06-29 17:12:13.345976194 +0200
 153 @@ -5,7 +5,7 @@
 154  #include "node.h"
 155
 156  #include <QtCore/QSignalMapper>
 157 -#include <QtGui/QPushButton>
 158 +#include <QtWidgets/QPushButton>
 159
 160  class DNSSECStatusFilter : public Filter
 161  {
 162 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/TypeFilter.h.orig      2013-02-14 15:43:03.000000000 +0100
 163 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/TypeFilter.h   2015-06-29 17:53:46.785871554 +0200
 164 @@ -4,7 +4,7 @@
 165  #include "Filter.h"
 166  #include "TypeMenu.h"
 167
 168 -#include <QtGui/QPushButton>
 169 +#include <QtWidgets/QPushButton>
 170  #include <QtCore/QSignalMapper>
 171
 172  class TypeFilter : public Filter
 173 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/NodeList.h.orig        2013-02-14 15:43:03.000000000 +0100
 174 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/NodeList.h     2015-06-29 18:07:30.795836973 +0200
 175 @@ -10,7 +10,7 @@
 176  #include "Filters/Filter.h"
 177  #include "FilterEditorWindow.h"
 178
 179 -#include <QtGui/QHBoxLayout>
 180 +#include <QtWidgets/QHBoxLayout>
 181
 182  class GraphWidget;
 183  class DNSData;
 184 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/NodesPreferences.h.orig        2011-09-23 19:54:13.000000000 +0200
 185 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/NodesPreferences.h     2015-06-29 18:42:27.702415642 +0200
 186 @@ -2,11 +2,11 @@
 187  #define NODESPREFERENCES_H
 188
 189  #include <QDialog>
 190 -#include <QtGui/QVBoxLayout>
 191 -#include <QtGui/QFormLayout>
 192 -#include <QtGui/QSpinBox>
 193 +#include <QtWidgets/QVBoxLayout>
 194 +#include <QtWidgets/QFormLayout>
 195 +#include <QtWidgets/QSpinBox>
 196  #include <QtCore/QSettings>
 197 -#include <QtGui/QCheckBox>
 198 +#include <QtWidgets/QCheckBox>
 199
 200  class NodesPreferences : public QDialog
 201  {
 202 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/LogFilePicker.h.orig   2011-10-07 16:23:49.000000000 +0200
 203 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/LogFilePicker.h        2015-06-29 19:20:40.992319401 +0200
 204 @@ -2,11 +2,11 @@
 205  #define LOGFILEPICKER_H
 206
 207  #include <QDialog>
 208 -#include <QtGui/QHBoxLayout>
 209 -#include <QtGui/QVBoxLayout>
 210 -#include <QtGui/QLineEdit>
 211 +#include <QtWidgets/QHBoxLayout>
 212 +#include <QtWidgets/QVBoxLayout>
 213 +#include <QtWidgets/QLineEdit>
 214  #include <QtCore/QString>
 215 -#include <QtGui/QCheckBox>
 216 +#include <QtWidgets/QCheckBox>
 217
 218  class LogFilePicker : public QDialog
 219  {
 220 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/NodesPreferences.cpp.orig      2011-09-23 19:54:13.000000000 +0200
 221 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/NodesPreferences.cpp   2015-06-29 19:30:12.122295433 +0200
 222 @@ -1,6 +1,6 @@
 223  #include "NodesPreferences.h"
 224
 225 -#include <QtGui/QDialogButtonBox>
 226 +#include <QtWidgets/QDialogButtonBox>
 227
 228  NodesPreferences::NodesPreferences(QSettings *settings, QWidget *parent) :
 229      QDialog(parent), m_settings(settings)
 230 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/DetailsViewer.cpp.orig 2014-08-15 22:20:16.000000000 +0200
 231 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/DetailsViewer.cpp      2015-06-29 20:04:58.995541190 +0200
 232 @@ -1,17 +1,17 @@
 233  #include "DetailsViewer.h"
 234
 235  #define QT_NO_PRINTER
 236 -#include <QtGui/QLabel>
 237 -#include <QtGui/QTextEdit>
 238 +#include <QtWidgets/QLabel>
 239 +#include <QtWidgets/QTextEdit>
 240  #include <QtGui/QFont>
 241 -#include <QtGui/QFormLayout>
 242 +#include <QtWidgets/QFormLayout>
 243  #include <QtGui/QStandardItemModel>
 244 -#include <QtGui/QTableView>
 245 -#include <QtGui/QTableWidget>
 246 -#include <QtGui/QHeaderView>
 247 +#include <QtWidgets/QTableView>
 248 +#include <QtWidgets/QTableWidget>
 249 +#include <QtWidgets/QHeaderView>
 250  #include <QtGui/QIcon>
 251  #include <QtGui/QPainter>
 252 -#include <QtGui/QPushButton>
 253 +#include <QtWidgets/QPushButton>
 254
 255  #include "ValidateViewWidgetHolder.h"
 256
 257 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/DNSSECStatusFilter.cpp.orig    2013-02-14 15:43:03.000000000 +0100
 258 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/DNSSECStatusFilter.cpp 2015-06-29 20:55:45.965413320 +0200
 259 @@ -1,7 +1,7 @@
 260  #include "DNSSECStatusFilter.h"
 261
 262 -#include <QtGui/QMenu>
 263 -#include <QtGui/QLabel>
 264 +#include <QtWidgets/QMenu>
 265 +#include <QtWidgets/QLabel>
 266
 267  DNSSECStatusFilter::DNSSECStatusFilter(int dnssecValitiy, bool requireAll)
 268      : Filter(), m_dnssecValidity(dnssecValitiy), m_requireAll(requireAll), m_mapper(), m_menuButton(0)
 269 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/NameFilter.cpp.orig    2013-02-14 19:01:09.000000000 +0100
 270 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/NameFilter.cpp 2015-06-29 21:30:57.028658061 +0200
 271 @@ -1,7 +1,7 @@
 272  #include "NameFilter.h"
 273
 274 -#include <QtGui/QLabel>
 275 -#include <QtGui/QLineEdit>
 276 +#include <QtWidgets/QLabel>
 277 +#include <QtWidgets/QLineEdit>
 278  #include <qdebug.h>
 279
 280  NameFilter::NameFilter(const QString &searchName, QObject *parent)
 281 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/TypeFilter.cpp.orig    2013-02-14 15:43:03.000000000 +0100
 282 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/TypeFilter.cpp 2015-06-29 21:36:20.908644468 +0200
 283 @@ -1,7 +1,7 @@
 284  #include "TypeFilter.h"
 285
 286 -#include <QtGui/QLabel>
 287 -#include <QtGui/QMenu>
 288 +#include <QtWidgets/QLabel>
 289 +#include <QtWidgets/QMenu>
 290
 291  #include <qdebug.h>
 292
 293 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/LogFilePicker.cpp.orig 2011-10-07 16:23:49.000000000 +0200
 294 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/LogFilePicker.cpp      2015-06-29 21:43:27.271959910 +0200
 295 @@ -1,10 +1,10 @@
 296  #include "LogFilePicker.h"
 297
 298 -#include <QtGui/QLabel>
 299 -#include <QtGui/QPushButton>
 300 -#include <QtGui/QCheckBox>
 301 -#include <QtGui/QDialogButtonBox>
 302 -#include <QtGui/QFileDialog>
 303 +#include <QtWidgets/QLabel>
 304 +#include <QtWidgets/QPushButton>
 305 +#include <QtWidgets/QCheckBox>
 306 +#include <QtWidgets/QDialogButtonBox>
 307 +#include <QtWidgets/QFileDialog>
 308
 309  LogFilePicker::LogFilePicker(QString defaultFile, QWidget *parent) :
 310      QDialog(parent)
 311 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/Legend.cpp.orig        2012-10-25 06:36:17.000000000 +0200
 312 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Legend.cpp     2015-06-29 21:52:30.241937125 +0200
 313 @@ -1,14 +1,14 @@
 314  #include "Legend.h"
 315
 316 -#include <QtGui/QVBoxLayout>
 317 -#include <QtGui/QLabel>
 318 -#include <QtGui/QDialogButtonBox>
 319 +#include <QtWidgets/QVBoxLayout>
 320 +#include <QtWidgets/QLabel>
 321 +#include <QtWidgets/QDialogButtonBox>
 322  #include <QTableWidget>
 323  #include <QtGui/QPainter>
 324  #include <QtGui/QPixmap>
 325  #include <QtGui/QIcon>
 326 -#include <QtGui/QTableWidgetItem>
 327 -#include <QtGui/QHeaderView>
 328 +#include <QtWidgets/QTableWidgetItem>
 329 +#include <QtWidgets/QHeaderView>
 330
 331  #include <qdebug.h>
 332
 333 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/MainWindow.cpp.orig    2013-02-15 22:41:19.000000000 +0100
 334 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/MainWindow.cpp 2015-06-29 21:53:47.315267221 +0200
 335 @@ -1,6 +1,6 @@
 336  #include "MainWindow.h"
 337
 338 -#include <QtGui/QMessageBox>
 339 +#include <QtWidgets/QMessageBox>
 340
 341  #include "NodeList.h"
 342  #include "LogWatcher.h"
 343 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/FilterEditorWindow.cpp.orig    2013-02-14 15:43:03.000000000 +0100
 344 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/FilterEditorWindow.cpp 2015-06-29 21:54:30.511932075 +0200
 345 @@ -1,8 +1,8 @@
 346  #include "FilterEditorWindow.h"
 347
 348 -#include <QtGui/QLabel>
 349 -#include <QtGui/QDialogButtonBox>
 350 -#include <QtGui/QGroupBox>
 351 +#include <QtWidgets/QLabel>
 352 +#include <QtWidgets/QDialogButtonBox>
 353 +#include <QtWidgets/QGroupBox>
 354
 355  FilterEditorWindow::FilterEditorWindow(NodeList *nodeList, QWidget *parent) :
 356      QDialog(parent), m_nodeList(nodeList)
 357 --- dnssec-tools-2.1/validator/apps/dnssec-nodes/PcapWatcher.cpp.orig   2014-08-15 22:20:16.000000000 +0200
 358 +++ dnssec-tools-2.1/validator/apps/dnssec-nodes/PcapWatcher.cpp        2015-06-30 18:03:22.995554842 +0200
 359 @@ -10,7 +10,7 @@
 360  #ifndef __MINGW_GCC
 361  #include <arpa/inet.h>
 362  #endif /* ! __MINGW_GCC */
 363 -#include <QtGui/QAction>
 364 +#include <QtWidgets/QAction>
 365  #include <QFileDialog>
 366
 367  typedef u_int32_t tcp_seq;
 368 --- dnssec-tools-2.1/validator/apps/dnssec-system-tray/dnssec-system-tray.h.orig        2014-08-28 20:26:59.000000000 +0200
 369 +++ dnssec-tools-2.1/validator/apps/dnssec-system-tray/dnssec-system-tray.h     2015-06-30 21:06:15.311761043 +0200
 370 @@ -45,10 +45,10 @@
 371
 372  #include <QSystemTrayIcon>
 373  #include <QDialog>
 374 -#include <QtGui/QVBoxLayout>
 375 -#include <QtGui/QLabel>
 376 +#include <QtWidgets/QVBoxLayout>
 377 +#include <QtWidgets/QLabel>
 378  #include <QtGui/QIcon>
 379 -#include <QtGui/QTableWidget>
 380 +#include <QtWidgets/QTableWidget>
 381  #include <QtCore/QFile>
 382  #include <QtCore/QTextStream>
 383  #include <QtCore/QRegExp>
 384 @@ -56,7 +56,7 @@
 385  #include <QtGui/QIcon>
 386  #include <QtCore/QMap>
 387  #include <QtCore/QDateTime>
 388 -#include <QtGui/QMainWindow>
 389 +#include <QtWidgets/QMainWindow>
 390
 391  class DNSTrayData {
 392  public:
 393 --- dnssec-tools-2.1/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.h.orig     2014-08-28 20:26:59.000000000 +0200
 394 +++ dnssec-tools-2.1/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.h  2015-07-01 16:07:25.758887612 +0200
 395 @@ -4,12 +4,12 @@
 396  #define QT_NO_PRINTER
 397
 398  #include <QDialog>
 399 -#include <QtGui/QVBoxLayout>
 400 -#include <QtGui/QFormLayout>
 401 -#include <QtGui/QLineEdit>
 402 -#include <QtGui/QSpinBox>
 403 -#include <QtGui/QCheckBox>
 404 -#include <QtGui/QTextEdit>
 405 +#include <QtWidgets/QVBoxLayout>
 406 +#include <QtWidgets/QFormLayout>
 407 +#include <QtWidgets/QLineEdit>
 408 +#include <QtWidgets/QSpinBox>
 409 +#include <QtWidgets/QCheckBox>
 410 +#include <QtWidgets/QTextEdit>
 411
 412  class DnssecSystemTrayPrefs : public QDialog
 413  {
 414 --- dnssec-tools-2.1/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.cpp.orig   2012-01-20 19:53:52.000000000 +0100
 415 +++ dnssec-tools-2.1/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.cpp        2015-07-01 16:08:09.728885767 +0200
 416 @@ -1,10 +1,10 @@
 417  #include "DnssecSystemTrayPrefs.h"
 418
 419  #include <QtCore/QSettings>
 420 -#include <QtGui/QDialogButtonBox>
 421 -#include <QtGui/QPushButton>
 422 -#include <QtGui/QFileDialog>
 423 -#include <QtGui/QLabel>
 424 +#include <QtWidgets/QDialogButtonBox>
 425 +#include <QtWidgets/QPushButton>
 426 +#include <QtWidgets/QFileDialog>
 427 +#include <QtWidgets/QLabel>
 428  #include <QtGui/QFont>
 429
 430  DnssecSystemTrayPrefs::DnssecSystemTrayPrefs(QWidget *parent) :
 431 --- dnssec-tools-2.1/validator/apps/lookup/src/qtmain.cpp.orig  2014-08-26 19:09:59.000000000 +0200
 432 +++ dnssec-tools-2.1/validator/apps/lookup/src/qtmain.cpp       2015-07-01 16:42:27.378799415 +0200
 433 @@ -3,8 +3,8 @@
 434   * Author: hardaker
 435   */
 436  #include <QWidget>
 437 -#include <QtGui/QApplication>
 438 -#include <QtGui/QPushButton>
 439 +#include <QtWidgets/QApplication>
 440 +#include <QtWidgets/QPushButton>
 441
 442  #include "lookup.h"
 443
 444 --- dnssec-tools-2.1/validator/apps/lookup/src/QDNSItemModel.h.orig     2011-05-18 22:15:55.000000000 +0200
 445 +++ dnssec-tools-2.1/validator/apps/lookup/src/QDNSItemModel.h  2015-07-01 16:43:11.965464211 +0200
 446 @@ -1,7 +1,7 @@
 447  #ifndef QDNSITEMMODEL_H
 448  #define QDNSITEMMODEL_H
 449
 450 -#include <QtGui/QWidget>
 451 +#include <QtWidgets/QWidget>
 452  #include <QtGui/QStandardItemModel>
 453
 454  #if (defined(Q_WS_MAEMO_5) || defined(MAEMO_CHANGES))
 455 --- dnssec-tools-2.1/validator/apps/lookup/src/LookupPrefs.h.orig       2014-08-26 19:09:59.000000000 +0200
 456 +++ dnssec-tools-2.1/validator/apps/lookup/src/LookupPrefs.h    2015-07-01 16:43:40.142129695 +0200
 457 @@ -2,9 +2,9 @@
 458  #define LOOKUPPREFS_H
 459
 460  #include <QDialog>
 461 -#include <QtGui/QVBoxLayout>
 462 -#include <QtGui/QFormLayout>
 463 -#include <QtGui/QLineEdit>
 464 +#include <QtWidgets/QVBoxLayout>
 465 +#include <QtWidgets/QFormLayout>
 466 +#include <QtWidgets/QLineEdit>
 467  #include <QWidget>
 468
 469  class LookupPrefs : public QDialog
 470 --- dnssec-tools-2.1/validator/apps/lookup/src/LookupPrefs.cpp.orig     2014-08-26 19:09:59.000000000 +0200
 471 +++ dnssec-tools-2.1/validator/apps/lookup/src/LookupPrefs.cpp  2015-07-01 16:47:07.335454333 +0200
 472 @@ -1,7 +1,7 @@
 473  #include <QWidget>
 474  #include "LookupPrefs.h"
 475 -#include <QtGui/QWidget>
 476 -#include <QtGui/QDialogButtonBox>
 477 +#include <QtWidgets/QWidget>
 478 +#include <QtWidgets/QDialogButtonBox>
 479  #include <QtCore/QSettings>
 480  LookupPrefs::LookupPrefs(QWidget *parent) :
 481      QDialog(parent)