blob: eb3ccf4ffee07333987f76f3a197df270e466c2f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
diff -NurdZ qdigidoc4_4.0.0.23.orig/client/dialogs/PinUnblock.cpp qdigidoc4_4.0.0.23/client/dialogs/PinUnblock.cpp
--- qdigidoc4_4.0.0.23.orig/client/dialogs/PinUnblock.cpp 2018-06-01 08:20:05.000000000 +0300
+++ qdigidoc4_4.0.0.23/client/dialogs/PinUnblock.cpp 2018-06-12 16:24:42.266717807 +0300
@@ -25,6 +25,7 @@
#include <QLabel>
#include <QList>
+#include <QtGui/QRegExpValidator>
struct InfoLine
diff -NurdZ qdigidoc4_4.0.0.23.orig/client/dialogs/Updater.cpp qdigidoc4_4.0.0.23/client/dialogs/Updater.cpp
--- qdigidoc4_4.0.0.23.orig/client/dialogs/Updater.cpp 2018-06-01 08:20:05.000000000 +0300
+++ qdigidoc4_4.0.0.23/client/dialogs/Updater.cpp 2018-06-12 16:23:14.046367649 +0300
@@ -40,6 +40,7 @@
#include <QtNetwork/QNetworkProxy>
#include <QtNetwork/QNetworkReply>
#include <QtNetwork/QSslKey>
+#include <QtGui/QRegExpValidator>
#include <QtGui/QPainter>
#include <QtWidgets/QPushButton>
diff -NurdZ qdigidoc4_4.0.0.23.orig/client/widgets/OtherData.h qdigidoc4_4.0.0.23/client/widgets/OtherData.h
--- qdigidoc4_4.0.0.23.orig/client/widgets/OtherData.h 2018-06-01 08:20:05.000000000 +0300
+++ qdigidoc4_4.0.0.23/client/widgets/OtherData.h 2018-06-12 16:31:54.445526409 +0300
@@ -21,6 +21,7 @@
#include <QWidget>
#include <QPainter>
+#include <QtWidgets/QStyleOption>
namespace Ui {
class OtherData;
diff -NurdZ qdigidoc4_4.0.0.23.orig/common/qtsingleapplication/CMakeLists.txt qdigidoc4_4.0.0.23/common/qtsingleapplication/CMakeLists.txt
--- qdigidoc4_4.0.0.23.orig/common/qtsingleapplication/CMakeLists.txt 2018-06-01 08:20:06.000000000 +0300
+++ qdigidoc4_4.0.0.23/common/qtsingleapplication/CMakeLists.txt 2018-06-12 16:20:07.692294653 +0300
@@ -5,5 +5,5 @@
set_target_properties( qtsingleapplication PROPERTIES AUTOMOC TRUE )
if( Qt5Widgets_FOUND )
- qt5_use_modules( qtsingleapplication Widgets Network )
+ target_link_libraries(qtsingleapplication Qt5::Widgets Qt5::Network)
endif()
|