Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37517373
en ru br
Репозитории ALT
S:0.99.5-alt6
5.1: 0.10.7-alt1
4.1: 0.8.17-alt1
4.0: 0.8.12-alt1
www.altlinux.org/Changes

Другие репозитории
Upstream:0.8.15

Группа :: Работа с текстами
Пакет: fbreader

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: fbreader-0.99.5-alt-qt5.patch
Скачать

diff --git a/FBReader/makefiles/arch/desktop.mk b/FBReader/makefiles/arch/desktop.mk
index 3e81598..b86f266 100644
--- a/FBReader/makefiles/arch/desktop.mk
+++ b/FBReader/makefiles/arch/desktop.mk
@@ -12,26 +12,14 @@ CC = $(CCACHE) gcc
 AR = ar rsu
 LD = g++
 
-CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
+override CFLAGS += -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
 LDFLAGS =
 EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) 
 
-ifeq "$(UI_TYPE)" "qt"
-  MOC = moc-qt3
-  QTINCLUDE = -I /usr/include/qt3
-else
-  MOC = $(shell pkg-config QtCore --variable=moc_location)
-  QTINCLUDE = -I $(shell pkg-config --cflags QtCore)
-endif
-
-GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft)
-
-ifeq "$(UI_TYPE)" "qt"
-  UILIBS = -lqt-mt
-endif
-
 ifeq "$(UI_TYPE)" "qt4"
-  UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork)
+  MOC = moc-qt5
+  QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
+  UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
 endif
 
 ifeq "$(UI_TYPE)" "gtk"
diff --git a/FBReader/makefiles/config.mk b/FBReader/makefiles/config.mk
index 12b9cc1..dd5b992 100644
--- a/FBReader/makefiles/config.mk
+++ b/FBReader/makefiles/config.mk
@@ -20,7 +20,7 @@ APPIMAGEDIR_MACRO ?= $(APPIMAGEDIR)
 XML_LIBS ?= -lexpat
 ARCHIVER_LIBS ?= -lz -lbz2
 
-CFLAGS += -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\"
+override CFLAGS += -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\"
 ifeq "$(ZLSHARED)" "yes"
   CFLAGS += -fPIC -DZLSHARED
 endif
diff --git a/FBReader/trash/waiting-icons/ZLQtWaitingIcons.h b/FBReader/trash/waiting-icons/ZLQtWaitingIcons.h
index a8beb89..f46c6f5 100644
--- a/FBReader/trash/waiting-icons/ZLQtWaitingIcons.h
+++ b/FBReader/trash/waiting-icons/ZLQtWaitingIcons.h
@@ -21,7 +21,7 @@
 #define __ZLQTWAITINGICONS_H__
 
 #include <QtCore/QTimer>
-#include <QtGui/QLabel>
+#include <QtWidgets/QLabel>
 #include <QtGui/QMovie>
 #include <QtGui/QColor>
 
diff --git a/FBReader/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp b/FBReader/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
index eead914..5481e98 100644
--- a/FBReader/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
@@ -17,13 +17,13 @@
  * 02110-1301, USA.
  */
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtGui/QPixmap>
 #include <QtGui/QIcon>
-#include <QtGui/QToolBar>
-#include <QtGui/QMenuBar>
-#include <QtGui/QMenu>
-#include <QtGui/QLineEdit>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QLineEdit>
 #include <QtGui/QWheelEvent>
 
 #include <ZLibrary.h>
diff --git a/FBReader/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h b/FBReader/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
index 075992b..600071c 100644
--- a/FBReader/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
+++ b/FBReader/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
@@ -23,9 +23,9 @@
 #include <map>
 #include <list>
 
-#include <QtGui/QMainWindow>
-#include <QtGui/QAction>
-#include <QtGui/QMenu>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMenu>
 #include <QtGui/QCursor>
 
 #include <ZLOptions.h>
diff --git a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
index b867bcf..d514412 100644
--- a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
@@ -17,8 +17,8 @@
  * 02110-1301, USA.
  */
 
-#include <QtGui/QApplication>
-#include <QtGui/QPushButton>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QPushButton>
 
 #include "ZLQtDialog.h"
 #include "ZLQtDialogContent.h"
diff --git a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
index 068039d..811cec8 100644
--- a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
+++ b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
@@ -20,8 +20,8 @@
 #ifndef __ZLQTDIALOG_H__
 #define __ZLQTDIALOG_H__
 
-#include <QtGui/QDialog>
-#include <QtGui/QLayout>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QLayout>
 
 #include <ZLDialog.h>
 
diff --git a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
index e8ff422..352c350 100644
--- a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
@@ -17,10 +17,10 @@
  * 02110-1301, USA.
  */
 
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QWidget>
-#include <QtGui/QLayout>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QLayout>
 
 #include "ZLQtDialogContent.h"
 #include "ZLQtOptionView.h"
diff --git a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
index 6331def..5fb05ea 100644
--- a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
@@ -17,14 +17,14 @@
  * 02110-1301, USA.
  */
 
-#include <QtGui/QApplication>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMessageBox>
-#include <QtGui/QFileDialog>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QFileDialog>
 #include <QtGui/QClipboard>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QLineEdit>
-#include <QtGui/QToolBar>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QToolBar>
 
 #include "ZLQtDialogManager.h"
 #include "ZLQtDialog.h"
diff --git a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
index ce821ad..f051271 100644
--- a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-#include <QtGui/QFileDialog>
+#include <QtWidgets/QFileDialog>
 
 #include "ZLQtOpenFileDialog.h"
 
diff --git a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
index 548eaea..d53c54d 100644
--- a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
@@ -19,16 +19,16 @@
 
 #include <cctype>
 
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QLabel>
-#include <QtGui/QGroupBox>
-#include <QtGui/QRadioButton>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpinBox>
-#include <QtGui/QLineEdit>
-#include <QtGui/QSlider>
-#include <QtGui/QLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QLayout>
 
 #include <ZLStringUtil.h>
 #include <ZLDialogManager.h>
diff --git a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
index d646dea..f768a87 100644
--- a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
@@ -19,12 +19,12 @@
 
 #include <algorithm>
 
-#include <QtGui/QApplication>
-#include <QtGui/QLayout>
-#include <QtGui/QStackedLayout>
-#include <QtGui/QListWidget>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QPushButton>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QStackedLayout>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QDialogButtonBox>
+#include <QtWidgets/QPushButton>
 #include <QtGui/QResizeEvent>
 
 #include "ZLQtOptionsDialog.h"
diff --git a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
index 8e28e3a..86c1c00 100644
--- a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
+++ b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
@@ -20,7 +20,7 @@
 #ifndef __ZLQTOPTIONSDIALOG_H__
 #define __ZLQTOPTIONSDIALOG_H__
 
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 
 #include <ZLOptionsDialog.h>
 
diff --git a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
index c2223ca..60e1d03 100644
--- a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
@@ -19,11 +19,11 @@
 
 #include <unistd.h>
 
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QWidget>
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLayout>
 #include <QtCore/QThreadPool>
 
 #include "ZLQtDialogManager.h"
diff --git a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
index df6c73b..837bce5 100644
--- a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
+++ b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
@@ -22,11 +22,11 @@
 
 #include <string>
 
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 #include <QtGui/QCursor>
-#include <QtGui/QDialog>
-#include <QtGui/QProgressBar>
-#include <QtGui/QLabel>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QProgressBar>
+#include <QtWidgets/QLabel>
 #include <QtCore/QRunnable>
 
 #include <ZLProgressDialog.h>
diff --git a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
index 7e08c78..d72c283 100644
--- a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
@@ -17,10 +17,10 @@
  * 02110-1301, USA.
  */
 
-#include <QtGui/QSplitter>
-#include <QtGui/QScrollBar>
+#include <QtWidgets/QSplitter>
+#include <QtWidgets/QScrollBar>
 #include <QtGui/QResizeEvent>
-#include <QtGui/QToolBar>
+#include <QtWidgets/QToolBar>
 
 #include <ZLFile.h>
 #include <ZLibrary.h>
diff --git a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
index 7c6d879..78865dc 100644
--- a/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
+++ b/FBReader/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
@@ -24,10 +24,10 @@
 #include <QtCore/QSet>
 #include <QtCore/QMap>
 
-#include <QtGui/QScrollArea>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QWidget>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QWidget>
 
 #include <ZLTreeDialog.h>
 
diff --git a/FBReader/zlibrary/ui/src/qt4/library/ZLQApplication.h b/FBReader/zlibrary/ui/src/qt4/library/ZLQApplication.h
index c08c536..a714fa9 100644
--- a/FBReader/zlibrary/ui/src/qt4/library/ZLQApplication.h
+++ b/FBReader/zlibrary/ui/src/qt4/library/ZLQApplication.h
@@ -20,7 +20,7 @@
 #ifndef __ZLQAPPLICATION_H__
 #define __ZLQAPPLICATION_H__
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 class ZLQApplication : public QApplication {
 
diff --git a/FBReader/zlibrary/ui/src/qt4/library/ZLibrary.cpp b/FBReader/zlibrary/ui/src/qt4/library/ZLibrary.cpp
index 6d83d8b..143061d 100644
--- a/FBReader/zlibrary/ui/src/qt4/library/ZLibrary.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/library/ZLibrary.cpp
@@ -20,9 +20,9 @@
 #include <QtCore/QFile>
 #include <QtCore/QTextCodec>
 #include <QtCore/QUrl>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtGui/QDesktopServices>
-#include <QtGui/QDesktopWidget>
+#include <QtWidgets/QDesktopWidget>
 #include <QtGui/QFileOpenEvent>
 
 #include <ZLApplication.h>
@@ -77,7 +77,7 @@ bool ZLQApplication::event(QEvent *e) {
 void ZLQtLibraryImplementation::init(int &argc, char **&argv) {
 	new ZLQApplication(argc, argv);
 
-	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8"));
+	QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
 
 	ZLibrary::parseArguments(argc, argv);
 
diff --git a/FBReader/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp b/FBReader/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
index 52bb4b3..99ce575 100644
--- a/FBReader/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
@@ -24,7 +24,9 @@
 #include <QtCore/QDir>
 #include <QtCore/QList>
 #include <QtCore/QTimer>
+#include <QtCore/QUrlQuery>
 
+#include <QtNetwork/QNetworkCookie>
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkProxy>
@@ -150,12 +152,12 @@ void ZLQtNetworkManager::prepareReply(ZLQtNetworkReplyScope &scope, QNetworkRequ
 	QNetworkReply *reply = NULL;
 	if (!scope.request->postParameters().empty()) {
 		QByteArray data;
-		QUrl tmp;
+		QUrlQuery tmp;
 		typedef std::pair<std::string, std::string> string_pair;
 		foreach (const string_pair &pair, scope.request->postParameters()) {
 			tmp.addQueryItem(::qtString(pair.first), ::qtString(pair.second));
 		}
-		data = tmp.encodedQuery();
+		data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery();
 		reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data);
 	} else {
 		reply = const_cast<QNetworkAccessManager&>(myManager).get(networkRequest);
diff --git a/FBReader/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h b/FBReader/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
index cdaef01..a259c65 100644
--- a/FBReader/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
+++ b/FBReader/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
@@ -3,7 +3,7 @@
 
 #include <QtCore/QTimer>
 
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 #include <QtGui/QColor>
 
 class QtWaitingSpinner : public QWidget {
diff --git a/FBReader/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp b/FBReader/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
index f5cea4f..da6d1a6 100644
--- a/FBReader/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
@@ -17,13 +17,13 @@
  * 02110-1301, USA.
  */
 
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
 #include <QtGui/QPixmap>
 #include <QtGui/QPalette>
 #include <QtGui/QPainter>
 #include <QtGui/QPaintEvent>
-#include <QtGui/QScrollBar>
+#include <QtWidgets/QScrollBar>
 
 #include <ZLibrary.h>
 #include <ZLNetworkManager.h>
diff --git a/FBReader/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h b/FBReader/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
index 4f09cfc..51f1545 100644
--- a/FBReader/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
+++ b/FBReader/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
@@ -20,12 +20,12 @@
 #ifndef __ZLQTITEMSLISTWIDGET_H__
 #define __ZLQTITEMSLISTWIDGET_H__
 
-#include <QtGui/QWidget>
-#include <QtGui/QFrame>
-#include <QtGui/QPushButton>
-#include <QtGui/QLabel>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QScrollArea>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QScrollArea>
 
 #include <ZLTreeTitledNode.h>
 
diff --git a/FBReader/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp b/FBReader/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
index b0d557d..0503d44 100644
--- a/FBReader/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
@@ -17,10 +17,10 @@
  * 02110-1301, USA.
  */
 
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QScrollBar>
-#include <QtGui/QGraphicsDropShadowEffect>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QGraphicsDropShadowEffect>
 
 #include <QtCore/QDebug>
 
diff --git a/FBReader/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h b/FBReader/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
index 1b8ebcc..6f3b4e3 100644
--- a/FBReader/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
+++ b/FBReader/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
@@ -20,11 +20,11 @@
 #ifndef __ZLQTPREVIEWWIDGET_H__
 #define __ZLQTPREVIEWWIDGET_H__
 
-#include <QtGui/QWidget>
-#include <QtGui/QPushButton>
-#include <QtGui/QLabel>
-#include <QtGui/QScrollArea>
-#include <QtGui/QVBoxLayout>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QVBoxLayout>
 #include <QtCore/QSet>
 
 #include <ZLTreePageNode.h>
diff --git a/FBReader/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp b/FBReader/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
index 96e7629..9e8a25e 100644
--- a/FBReader/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
@@ -18,9 +18,9 @@
  */
 
 #include <QtCore/QDebug>
-#include <QtGui/QStyle>
-#include <QtGui/QCompleter>
-#include <QtGui/QStringListModel>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QCompleter>
+#include <QtCore/QStringListModel>
 
 #include <ZLResource.h>
 #include <ZLOptions.h>
diff --git a/FBReader/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h b/FBReader/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
index dedcfb3..4c99a90 100644
--- a/FBReader/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
+++ b/FBReader/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
@@ -21,8 +21,8 @@
 #define __ZLQTSEARCHFIELD_H__
 
 #include <QtCore/QSet>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
 
 #include "QtWaitingSpinner.h"
 #include "ZLQtItemsListWidget.h"
diff --git a/FBReader/zlibrary/ui/src/qt4/util/ZLQtGeometryOptions.cpp b/FBReader/zlibrary/ui/src/qt4/util/ZLQtGeometryOptions.cpp
index c2299a3..b34b473 100644
--- a/FBReader/zlibrary/ui/src/qt4/util/ZLQtGeometryOptions.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/util/ZLQtGeometryOptions.cpp
@@ -17,8 +17,8 @@
  * 02110-1301, USA.
  */
 
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
 
 #include "ZLQtGeometryOptions.h"
 
diff --git a/FBReader/zlibrary/ui/src/qt4/util/ZLQtMainWindow.cpp b/FBReader/zlibrary/ui/src/qt4/util/ZLQtMainWindow.cpp
index 1545588..78113c7 100644
--- a/FBReader/zlibrary/ui/src/qt4/util/ZLQtMainWindow.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/util/ZLQtMainWindow.cpp
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-#include <QtGui/QToolBar>
+#include <QtWidgets/QToolBar>
 
 #include "ZLQtMainWindow.h"
 
diff --git a/FBReader/zlibrary/ui/src/qt4/util/ZLQtMainWindow.h b/FBReader/zlibrary/ui/src/qt4/util/ZLQtMainWindow.h
index 7ce0100..1eb9405 100644
--- a/FBReader/zlibrary/ui/src/qt4/util/ZLQtMainWindow.h
+++ b/FBReader/zlibrary/ui/src/qt4/util/ZLQtMainWindow.h
@@ -22,7 +22,7 @@
 
 #include <string>
 
-#include <QtGui/QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 #include <ZLOptions.h>
 
diff --git a/FBReader/zlibrary/ui/src/qt4/util/ZLQtToolbarButton.h b/FBReader/zlibrary/ui/src/qt4/util/ZLQtToolbarButton.h
index 8b21123..bbb2380 100644
--- a/FBReader/zlibrary/ui/src/qt4/util/ZLQtToolbarButton.h
+++ b/FBReader/zlibrary/ui/src/qt4/util/ZLQtToolbarButton.h
@@ -20,7 +20,7 @@
 #ifndef __ZLQTTOOLBARBUTTON_H__
 #define __ZLQTTOOLBARBUTTON_H__
 
-#include <QtGui/QPushButton>
+#include <QtWidgets/QPushButton>
 #include <QtGui/QPixmap>
 
 class QWidget;
diff --git a/FBReader/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp b/FBReader/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
index d708666..8f84462 100644
--- a/FBReader/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
+++ b/FBReader/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
@@ -19,8 +19,8 @@
 
 #include <algorithm>
 
-#include <QtGui/QLayout>
-#include <QtGui/QScrollBar>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QScrollBar>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
 #include <QtGui/QMouseEvent>
@@ -185,11 +185,11 @@ void ZLQtViewWidget::repaint()	{
 
 void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
 	if (direction == ZLView::VERTICAL) {
-		myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
-		myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
+		myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight);
+		myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight);
 	} else {
-		myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
-		myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
+		myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom);
+		myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom);
 	}
 }
 
diff --git a/FBReader/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h b/FBReader/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
index 6fabf00..ccec1e3 100644
--- a/FBReader/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
+++ b/FBReader/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
@@ -20,7 +20,7 @@
 #ifndef __ZLQTVIEWWIDGET_H__
 #define __ZLQTVIEWWIDGET_H__
 
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 #include "../../../../core/src/view/ZLViewWidget.h"
 #include <ZLApplication.h>
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin