components/desktop/fbreader/patches/06-qt5.patch

   1 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
   2 ===================================================================
   3 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
   4 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
   5 @@ -24,7 +24,9 @@
   6  #include <QtCore/QDir>
   7  #include <QtCore/QList>
   8  #include <QtCore/QTimer>
   9 +#include <QtCore/QUrlQuery>
  10
  11 +#include <QtNetwork/QNetworkCookie>
  12  #include <QtNetwork/QNetworkRequest>
  13  #include <QtNetwork/QNetworkReply>
  14  #include <QtNetwork/QNetworkProxy>
  15 @@ -149,12 +151,12 @@ void ZLQtNetworkManager::prepareReply(ZL
  16         QNetworkReply *reply = NULL;
  17         if (!scope.request->postParameters().empty()) {
  18                 QByteArray data;
  19 -               QUrl tmp;
  20 +               QUrlQuery tmp;
  21                 typedef std::pair<std::string, std::string> string_pair;
  22                 foreach (const string_pair &pair, scope.request->postParameters()) {
  23                         tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second));
  24                 }
  25 -               data = tmp.encodedQuery();
  26 +               data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery();
  27                 reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data);
  28         } else {
  29                 reply = const_cast<QNetworkAccessManager&>(myManager).get(networkRequest);
  30 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
  31 ===================================================================
  32 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
  33 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
  34 @@ -17,14 +17,14 @@
  35   * 02110-1301, USA.
  36   */
  37
  38 -#include <QtGui/QVBoxLayout>
  39 -#include <QtGui/QHBoxLayout>
  40  #include <QtGui/QPixmap>
  41  #include <QtGui/QPalette>
  42  #include <QtGui/QPainter>
  43  #include <QtGui/QPaintEvent>
  44 -#include <QtGui/QScrollBar>
  45  #include <QtCore/QTimer>
  46 +#include <QtWidgets/QVBoxLayout>
  47 +#include <QtWidgets/QHBoxLayout>
  48 +#include <QtWidgets/QScrollBar>
  49
  50  #include <QtCore/QDebug>
  51
  52 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
  53 ===================================================================
  54 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
  55 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
  56 @@ -17,10 +17,10 @@
  57   * 02110-1301, USA.
  58   */
  59
  60 -#include <QtGui/QVBoxLayout>
  61 -#include <QtGui/QHBoxLayout>
  62 -#include <QtGui/QScrollBar>
  63 -#include <QtGui/QGraphicsDropShadowEffect>
  64 +#include <QtWidgets/QVBoxLayout>
  65 +#include <QtWidgets/QHBoxLayout>
  66 +#include <QtWidgets/QScrollBar>
  67 +#include <QtWidgets/QGraphicsDropShadowEffect>
  68
  69  #include <QtCore/QDebug>
  70
  71 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
  72 ===================================================================
  73 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
  74 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
  75 @@ -18,9 +18,9 @@
  76   */
  77
  78  #include <QtCore/QDebug>
  79 -#include <QtGui/QStyle>
  80 -#include <QtGui/QCompleter>
  81 -#include <QtGui/QStringListModel>
  82 +#include <QtCore/QStringListModel>
  83 +#include <QtWidgets/QStyle>
  84 +#include <QtWidgets/QCompleter>
  85
  86  #include <ZLibrary.h>
  87  #include <ZLFile.h>
  88 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
  89 ===================================================================
  90 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
  91 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
  92 @@ -19,12 +19,12 @@
  93
  94  #include <algorithm>
  95
  96 -#include <QtGui/QSplitter>
  97 -#include <QtGui/QVBoxLayout>
  98 -#include <QtGui/QHBoxLayout>
  99 -#include <QtGui/QScrollBar>
 100  #include <QtGui/QResizeEvent>
 101  #include <QtCore/QDebug>
 102 +#include <QtWidgets/QSplitter>
 103 +#include <QtWidgets/QVBoxLayout>
 104 +#include <QtWidgets/QHBoxLayout>
 105 +#include <QtWidgets/QScrollBar>
 106
 107  #include <ZLFile.h>
 108  #include <ZLibrary.h>
 109 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
 110 ===================================================================
 111 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
 112 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
 113 @@ -20,12 +20,12 @@
 114  #ifndef __ZLQTITEMSLISTWIDGET_H__
 115  #define __ZLQTITEMSLISTWIDGET_H__
 116
 117 -#include <QtGui/QWidget>
 118 -#include <QtGui/QFrame>
 119 -#include <QtGui/QPushButton>
 120 -#include <QtGui/QLabel>
 121 -#include <QtGui/QVBoxLayout>
 122 -#include <QtGui/QScrollArea>
 123 +#include <QtWidgets/QWidget>
 124 +#include <QtWidgets/QFrame>
 125 +#include <QtWidgets/QPushButton>
 126 +#include <QtWidgets/QLabel>
 127 +#include <QtWidgets/QVBoxLayout>
 128 +#include <QtWidgets/QScrollArea>
 129
 130  #include <ZLTreeTitledNode.h>
 131
 132 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
 133 ===================================================================
 134 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
 135 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
 136 @@ -17,9 +17,9 @@
 137   * 02110-1301, USA.
 138   */
 139
 140 -#include <QtGui/QBoxLayout>
 141 -#include <QtGui/QLineEdit>
 142 -#include <QtGui/QToolBar>
 143 +#include <QtWidgets/QBoxLayout>
 144 +#include <QtWidgets/QLineEdit>
 145 +#include <QtWidgets/QToolBar>
 146  #include <QtGui/QKeyEvent>
 147
 148  #include "ZLQtApplicationWindow.h"
 149 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
 150 ===================================================================
 151 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
 152 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
 153 @@ -17,17 +17,17 @@
 154   * 02110-1301, USA.
 155   */
 156
 157 -#include <QtGui/QApplication>
 158 +#include <QtWidgets/QApplication>
 159  #include <QtGui/QPixmap>
 160  #include <QtGui/QImage>
 161  #include <QtGui/QIcon>
 162 -#include <QtGui/QToolBar>
 163 -#include <QtGui/QMenuBar>
 164 -#include <QtGui/QMenu>
 165 -#include <QtGui/QToolButton>
 166 -#include <QtGui/QLayout>
 167 +#include <QtWidgets/QToolBar>
 168 +#include <QtWidgets/QMenuBar>
 169 +#include <QtWidgets/QMenu>
 170 +#include <QtWidgets/QToolButton>
 171 +#include <QtWidgets/QLayout>
 172  #include <QtGui/QWheelEvent>
 173 -#include <QtGui/QDockWidget>
 174 +#include <QtWidgets/QDockWidget>
 175  #include <QtCore/QObjectList>
 176
 177  #include <ZLibrary.h>
 178 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
 179 ===================================================================
 180 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
 181 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
 182 @@ -22,8 +22,8 @@
 183
 184  #include <map>
 185
 186 -#include <QtGui/QMainWindow>
 187 -#include <QtGui/QAction>
 188 +#include <QtWidgets/QMainWindow>
 189 +#include <QtWidgets/QAction>
 190  #include <QtGui/QCursor>
 191
 192  class QDockWidget;
 193 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
 194 ===================================================================
 195 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
 196 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
 197 @@ -17,8 +17,8 @@
 198   * 02110-1301, USA.
 199   */
 200
 201 -#include <QtGui/QApplication>
 202 -#include <QtGui/QPushButton>
 203 +#include <QtWidgets/QApplication>
 204 +#include <QtWidgets/QPushButton>
 205
 206  #include <ZLDialogManager.h>
 207
 208 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
 209 ===================================================================
 210 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
 211 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
 212 @@ -20,8 +20,8 @@
 213  #ifndef __ZLQTDIALOG_H__
 214  #define __ZLQTDIALOG_H__
 215
 216 -#include <QtGui/QDialog>
 217 -#include <QtGui/QLayout>
 218 +#include <QtWidgets/QDialog>
 219 +#include <QtWidgets/QLayout>
 220
 221  #include <ZLDialog.h>
 222
 223 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
 224 ===================================================================
 225 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
 226 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
 227 @@ -17,10 +17,10 @@
 228   * 02110-1301, USA.
 229   */
 230
 231 -#include <QtGui/QApplication>
 232 -#include <QtGui/QDesktopWidget>
 233 -#include <QtGui/QWidget>
 234 -#include <QtGui/QLayout>
 235 +#include <QtWidgets/QApplication>
 236 +#include <QtWidgets/QDesktopWidget>
 237 +#include <QtWidgets/QWidget>
 238 +#include <QtWidgets/QLayout>
 239
 240  #include "ZLQtDialogContent.h"
 241  #include "ZLQtOptionView.h"
 242 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
 243 ===================================================================
 244 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
 245 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
 246 @@ -17,11 +17,11 @@
 247   * 02110-1301, USA.
 248   */
 249
 250 -#include <QtGui/QApplication>
 251 -#include <QtGui/QMessageBox>
 252 -#include <QtGui/QFileDialog>
 253 +#include <QtWidgets/QApplication>
 254 +#include <QtWidgets/QMessageBox>
 255 +#include <QtWidgets/QFileDialog>
 256  #include <QtGui/QClipboard>
 257 -#include <QtGui/QDesktopWidget>
 258 +#include <QtWidgets/QDesktopWidget>
 259
 260  #include "ZLQtDialogManager.h"
 261  #include "ZLQtDialog.h"
 262 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
 263 ===================================================================
 264 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
 265 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
 266 @@ -17,7 +17,7 @@
 267   * 02110-1301, USA.
 268   */
 269
 270 -#include <QtGui/QFileDialog>
 271 +#include <QtWidgets/QFileDialog>
 272
 273  #include "ZLQtOpenFileDialog.h"
 274
 275 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
 276 ===================================================================
 277 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
 278 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
 279 @@ -19,16 +19,16 @@
 280
 281  #include <cctype>
 282
 283 -#include <QtGui/QCheckBox>
 284 -#include <QtGui/QComboBox>
 285 -#include <QtGui/QLabel>
 286 -#include <QtGui/QGroupBox>
 287 -#include <QtGui/QRadioButton>
 288 -#include <QtGui/QPushButton>
 289 -#include <QtGui/QSpinBox>
 290 -#include <QtGui/QLineEdit>
 291 -#include <QtGui/QSlider>
 292 -#include <QtGui/QLayout>
 293 +#include <QtWidgets/QCheckBox>
 294 +#include <QtWidgets/QComboBox>
 295 +#include <QtWidgets/QLabel>
 296 +#include <QtWidgets/QGroupBox>
 297 +#include <QtWidgets/QRadioButton>
 298 +#include <QtWidgets/QPushButton>
 299 +#include <QtWidgets/QSpinBox>
 300 +#include <QtWidgets/QLineEdit>
 301 +#include <QtWidgets/QSlider>
 302 +#include <QtWidgets/QLayout>
 303
 304  #include <ZLStringUtil.h>
 305  #include <ZLDialogManager.h>
 306 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
 307 ===================================================================
 308 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
 309 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
 310 @@ -17,11 +17,11 @@
 311   * 02110-1301, USA.
 312   */
 313
 314 -#include <QtGui/QApplication>
 315 -#include <QtGui/QDesktopWidget>
 316 -#include <QtGui/QLayout>
 317 -#include <QtGui/QPushButton>
 318 -#include <QtGui/QButtonGroup>
 319 +#include <QtWidgets/QApplication>
 320 +#include <QtWidgets/QDesktopWidget>
 321 +#include <QtWidgets/QLayout>
 322 +#include <QtWidgets/QPushButton>
 323 +#include <QtWidgets/QButtonGroup>
 324  #include <QtGui/QResizeEvent>
 325
 326  #include <ZLDialogManager.h>
 327 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
 328 ===================================================================
 329 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
 330 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
 331 @@ -20,9 +20,9 @@
 332  #ifndef __ZLQTOPTIONSDIALOG_H__
 333  #define __ZLQTOPTIONSDIALOG_H__
 334
 335 -#include <QtGui/QWidget>
 336 -#include <QtGui/QTabWidget>
 337 -#include <QtGui/QDialog>
 338 +#include <QtWidgets/QWidget>
 339 +#include <QtWidgets/QTabWidget>
 340 +#include <QtWidgets/QDialog>
 341
 342  #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
 343
 344 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
 345 ===================================================================
 346 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
 347 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
 348 @@ -19,11 +19,11 @@
 349
 350  #include <unistd.h>
 351
 352 -#include <QtGui/QApplication>
 353 -#include <QtGui/QDesktopWidget>
 354 -#include <QtGui/QWidget>
 355 -#include <QtGui/QLabel>
 356 -#include <QtGui/QLayout>
 357 +#include <QtWidgets/QApplication>
 358 +#include <QtWidgets/QDesktopWidget>
 359 +#include <QtWidgets/QWidget>
 360 +#include <QtWidgets/QLabel>
 361 +#include <QtWidgets/QLayout>
 362  #include <QtCore/QThreadPool>
 363
 364  #include "../dialogs/ZLQtDialogManager.h"
 365 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
 366 ===================================================================
 367 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
 368 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
 369 @@ -22,11 +22,11 @@
 370
 371  #include <string>
 372
 373 -#include <QtGui/QWidget>
 374 +#include <QtWidgets/QWidget>
 375  #include <QtGui/QCursor>
 376 -#include <QtGui/QDialog>
 377 -#include <QtGui/QProgressBar>
 378 -#include <QtGui/QLabel>
 379 +#include <QtWidgets/QDialog>
 380 +#include <QtWidgets/QProgressBar>
 381 +#include <QtWidgets/QLabel>
 382  #include <QtCore/QRunnable>
 383
 384  #include <ZLProgressDialog.h>
 385 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
 386 ===================================================================
 387 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
 388 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
 389 @@ -24,12 +24,12 @@
 390  #include <QtCore/QSet>
 391  #include <QtCore/QMap>
 392
 393 -#include <QtGui/QDialog>
 394 -#include <QtGui/QScrollArea>
 395 -#include <QtGui/QPushButton>
 396 -#include <QtGui/QLabel>
 397 -#include <QtGui/QLineEdit>
 398 -#include <QtGui/QWidget>
 399 +#include <QtWidgets/QDialog>
 400 +#include <QtWidgets/QScrollArea>
 401 +#include <QtWidgets/QPushButton>
 402 +#include <QtWidgets/QLabel>
 403 +#include <QtWidgets/QLineEdit>
 404 +#include <QtWidgets/QWidget>
 405
 406  #include <ZLTreeDialog.h>
 407
 408 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h
 409 ===================================================================
 410 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h
 411 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h
 412 @@ -20,7 +20,7 @@
 413  #ifndef __ZLQAPPLICATION_H__
 414  #define __ZLQAPPLICATION_H__
 415
 416 -#include <QtGui/QApplication>
 417 +#include <QtWidgets/QApplication>
 418
 419  class ZLQApplication : public QApplication {
 420
 421 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp
 422 ===================================================================
 423 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp
 424 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp
 425 @@ -19,7 +19,7 @@
 426
 427  #include <QtCore/QTextCodec>
 428  #include <QtCore/QFile>
 429 -#include <QtGui/QApplication>
 430 +#include <QtWidgets/QApplication>
 431  #include <QtGui/QFileOpenEvent>
 432
 433  #include <ZLApplication.h>
 434 @@ -72,7 +72,7 @@ bool ZLQApplication::event(QEvent *e) {
 435  void ZLQtLibraryImplementation::init(int &argc, char **&argv) {
 436         new ZLQApplication(argc, argv);
 437
 438 -       QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8"));
 439 +       QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
 440
 441         ZLibrary::parseArguments(argc, argv);
 442
 443 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
 444 ===================================================================
 445 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
 446 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
 447 @@ -3,7 +3,7 @@
 448
 449  #include <QtCore/QTimer>
 450
 451 -#include <QtGui/QWidget>
 452 +#include <QtWidgets/QWidget>
 453  #include <QtGui/QColor>
 454
 455  class QtWaitingSpinner : public QWidget {
 456 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
 457 ===================================================================
 458 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
 459 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
 460 @@ -20,11 +20,11 @@
 461  #ifndef __ZLQTPREVIEWWIDGET_H__
 462  #define __ZLQTPREVIEWWIDGET_H__
 463
 464 -#include <QtGui/QWidget>
 465 -#include <QtGui/QPushButton>
 466 -#include <QtGui/QLabel>
 467 -#include <QtGui/QScrollArea>
 468 -#include <QtGui/QVBoxLayout>
 469 +#include <QtWidgets/QWidget>
 470 +#include <QtWidgets/QPushButton>
 471 +#include <QtWidgets/QLabel>
 472 +#include <QtWidgets/QScrollArea>
 473 +#include <QtWidgets/QVBoxLayout>
 474  #include <QtCore/QSet>
 475
 476  #include <ZLTreePageNode.h>
 477 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
 478 ===================================================================
 479 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
 480 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
 481 @@ -21,8 +21,8 @@
 482  #define __ZLQTSEARCHFIELD_H__
 483
 484  #include <QtCore/QSet>
 485 -#include <QtGui/QLabel>
 486 -#include <QtGui/QLineEdit>
 487 +#include <QtWidgets/QLabel>
 488 +#include <QtWidgets/QLineEdit>
 489
 490  #include "QtWaitingSpinner.h"
 491  #include "ZLQtItemsListWidget.h"
 492 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
 493 ===================================================================
 494 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
 495 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
 496 @@ -19,8 +19,8 @@
 497
 498  #include <algorithm>
 499
 500 -#include <QtGui/QLayout>
 501 -#include <QtGui/QScrollBar>
 502 +#include <QtWidgets/QLayout>
 503 +#include <QtWidgets/QScrollBar>
 504  #include <QtGui/QPainter>
 505  #include <QtGui/QPixmap>
 506  #include <QtGui/QMouseEvent>
 507 @@ -185,11 +185,11 @@ void ZLQtViewWidget::repaint()    {
 508
 509  void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
 510         if (direction == ZLView::VERTICAL) {
 511 -               myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
 512 -               myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
 513 +               myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight);
 514 +               myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight);
 515         } else {
 516 -               myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
 517 -               myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
 518 +               myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom);
 519 +               myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom);
 520         }
 521  }
 522
 523 Index: fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
 524 ===================================================================
 525 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
 526 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
 527 @@ -20,7 +20,7 @@
 528  #ifndef __ZLQTVIEWWIDGET_H__
 529  #define __ZLQTVIEWWIDGET_H__
 530
 531 -#include <QtGui/QWidget>
 532 +#include <QtWidgets/QWidget>
 533
 534  #include "../../../../core/src/view/ZLViewWidget.h"
 535  #include <ZLApplication.h>
 536 Index: fbreader-0.99.4/makefiles/arch/desktop.mk
 537 ===================================================================
 538 --- fbreader-0.99.4.orig/makefiles/arch/desktop.mk
 539 +++ fbreader-0.99.4/makefiles/arch/desktop.mk
 540 @@ -12,31 +12,13 @@ CC = $(CCACHE) gcc
 541  AR = ar rsu
 542  LD = g++
 543
 544 -CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
 545 +CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG -fPIC
 546  LDFLAGS =
 547 -EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
 548 +EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
 549
 550 -ifeq "$(UI_TYPE)" "qt"
 551 -  MOC = moc-qt3
 552 -  QTINCLUDE = -I /usr/include/qt3
 553 -else
 554 -  MOC = $(shell pkg-config QtCore --variable=moc_location)
 555 -  QTINCLUDE = -I $(shell pkg-config --cflags QtCore)
 556 -endif
 557 -
 558 -GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft)
 559 -
 560 -ifeq "$(UI_TYPE)" "qt"
 561 -  UILIBS = -lqt-mt
 562 -endif
 563 -
 564 -ifeq "$(UI_TYPE)" "qt4"
 565 -  UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork)
 566 -endif
 567 -
 568 -ifeq "$(UI_TYPE)" "gtk"
 569 -  UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg
 570 -endif
 571 +MOC = /usr/bin/moc-qt5
 572 +QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
 573 +UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
 574
 575  RM = rm -rvf
 576  RM_QUIET = rm -rf