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