From b620fb1b0929ff9657a2588aaa42b85e3021c102 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 20 Oct 2017 17:35:36 +0100
Subject: gentoo resync : 20.10.2017

---
 app-text/fbreader/Manifest                        |   2 +
 app-text/fbreader/fbreader-0.99.4-r3.ebuild       |  95 ++++
 app-text/fbreader/files/fbreader-0.99.4-qt5.patch | 573 ++++++++++++++++++++++
 3 files changed, 670 insertions(+)
 create mode 100644 app-text/fbreader/fbreader-0.99.4-r3.ebuild
 create mode 100644 app-text/fbreader/files/fbreader-0.99.4-qt5.patch

(limited to 'app-text/fbreader')

diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index 99d782c8d632..1e9fb0c4f068 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -2,9 +2,11 @@ AUX fbreader-0.99.4-gcc6.patch 512 SHA256 bc67b538c51a5b77468469df6b5e96ce918ee1
 AUX fbreader-0.99.4-ld-bfd.patch 532 SHA256 c583f1bf48349f69972e83955265799ea218c2b359a3eb0eb11211ae7c9d5802 SHA512 77c6a0454706f68f5065333c1bbf8456aaf405ae8532019f1d557d5f66d7d0b633d409b320c8ffba50a78d04f4d64c7d655c3b0ee6f87fdf146aa5f04332167d WHIRLPOOL 7be2d6bf4bb4f8d473cb804dee90ae26608f57ec65e1f8bf14d10dbf1eb17d5693fd0b1d767be24ee35fdcae4ad73e9883b7df962d6d4b757983cc98ac1b890a
 AUX fbreader-0.99.4-mimetypes.patch 505 SHA256 8f7f6c793ed08ef305031d402e996911942fabead97e69f87e7cc556572647f1 SHA512 03fd64a802be53bf33c9582d5c2804e0c67809a43db02a2bfbc3e5a15592346cae9ba44333f2f547bcc623bc1d9785ca7a10c77d58a23152a1d3f59328e75d7b WHIRLPOOL 3f4847c2c02cd9f6dedd1df4fc33ca007ee8fd3dac6d0ba170bb2f188a1fad4f393ae1865dd705f78b4666e0af48684c2bae3ce5f7c55a3a83baadb8d580dd66
 AUX fbreader-0.99.4-qreal-cast.patch 950 SHA256 0f3e585292c0dbefa4db33c2b69e90871400be0f92f18fa6ed32daae1227f848 SHA512 260e1966eb5f0bfd42fc3c28fdcdd92d37314d93b31f44e1ec0f94e81ad0084caeaadb69cbd16eb4e8f8b9359534449604845e1b79e63b0dd2eff96b342286d1 WHIRLPOOL aafe31212c1111e43d504f4b84119cdd766c656c86ea454a2fbee541fa5f6bf3649c33aa4874b578d5f0b8ad0541b417a9c69bca11c06c63263f52b62dd3a12d
+AUX fbreader-0.99.4-qt5.patch 18697 SHA256 d47410910cae77622f31db26cd91350998bd725070ca70da1cdd1873d7655b65 SHA512 9eb8319308a36cada28d6036ee0537433cea03cb59e648c6ad1dd8f4d10a1b05fb879ebd38b1f9b1e149e6a6544aaafb93c52d6a97f4c9fd8905e89b8cf7ae86 WHIRLPOOL 23ec6fd884e27b933ea0b0b44fddcce4796396b2c25f9c1e78c7427d331da01fd53cbf36b507da5c3553679677eaea745a8412b49d48ab68ea73007d471b2e75
 AUX fbreader-0.99.4.patch 472 SHA256 cb3aa6795c8f7c694ba296f6f6e6a7939648578a289bc84c10f8302c7e72df86 SHA512 486dc74e3cfc6f94f1bf95269e35e866465095efee0cd31b586592fbd780613d4d5d243b809e494da14a69da8e0c5e47e6dd2ca35619616c4497eb0a053ba09d WHIRLPOOL c9bed0e846e90e9d31240d24ae536092a00819676fa9588b3125182bb242a597a69947eaa4b19ab5f7b2aba5fc4cf5e700c945f5174d2e8a384677ac6c256c42
 DIST fbreader-sources-0.99.4.tgz 2345664 SHA256 3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7 WHIRLPOOL 1d25ff39bcd93d3b0445abc76d3bbaf5e376385303fd71c98e3844123c85b9edd413f18c8d89a95807391ee2fb9c044d4dfc4b5898484548a011ecc22993e3d9
 EBUILD fbreader-0.99.4-r2.ebuild 2144 SHA256 87b49ae4e525a1c9d285a9ed49bf36ea2bc9f6a5b2e13ac73e28cac9807632e7 SHA512 4219403d355e7b38a04944cb589090a412fcbf1fdf2c21a5f04984f41c6175096bcc9436dd0179e19687f08d5b6326290baadb8b4e641254f627c679b50d09ee WHIRLPOOL 4f029512f2400269915e8c27bb718d157d98a325921c3e1c8ff6d66a1f8f9d4b31994d5aeaa4fa253f74410bc27d81e4b67248347059e7b4295d94dfcaef9718
+EBUILD fbreader-0.99.4-r3.ebuild 2281 SHA256 12691a927fa20dbca693bad35f30c12f62eee718f563a501478709007c5664df SHA512 6f16084876a1a9c412f2c347582f93d4ffbb130fcf5acc62a9ec5eb21b920fcad1aef215d5ee0377bb4a8ccacd084beabbdb449034ba159f83ef2ae0353d066f WHIRLPOOL e31478edb64c05dc80ef65bcfcee4a6397ddebc41ad87428d4660a2f7e4365de0ea09e8be1f6c89d901e4e8184f396bac1180b2618d27b50853dc1e2ab2714d8
 MISC ChangeLog 2862 SHA256 d71979bfe4b7db5a250a69508147d5b041345332d79da2aef5674f3e225a6461 SHA512 7119be4d7ab6af8835a81ea616b15febdc480987669e60e88ac6e401e46eebea51b9abd1a3f22e797f7a644e14a481a184df2302bcb3b2c8712dc6e71646d489 WHIRLPOOL f756ded8013beb14a2a574d5414cc5cb9aef19a12ff5ec75ec30a0c56eec9f5fd20b5c468dade79f0196e7a16f5a4993dfb7dccdbb1f4bd515a1feca37818bca
 MISC ChangeLog-2015 6698 SHA256 1df0df24d5560e8398111e053087e8153ee5f9da9dbd8cd2868db3c58449929d SHA512 31b67c3fb8c0b3854d750f0bf2840cbc82d99e7b67c599898c3f5a6f6ae4b2a94e1afc6b4cd1f9bfba0e24f3dacb80abcabe610b0e90626822843464d471ef93 WHIRLPOOL 8c9e35fadbd828160efdec9673f2fc3e26b1c7f10c551fd2097558cb397af939600eb2e07eedc896ecf129f9c1dfd4291ff78ca40f60c86d3ee99c330f3acf03
 MISC metadata.xml 332 SHA256 e5dde6d2eaf01486025c10a8ddea13c5db04504de76002de9beaf0042f73760b SHA512 f8ea42df45ef57c3a81098a86e13ab124ebfb4f6a8ae34153a03977e122448358d2cb852dd1f9b95a50e293f33a159940132b35b9444e5553eed6017bdeb5e98 WHIRLPOOL 2fa86bf91438ae5df35038019aa2e2d27eb79bd5510830bbdc3e7d0c9ba9e2217fe8c7d160d0874a5d10dbb630c962d24b8625f3b6eda915c77fd47940853372
diff --git a/app-text/fbreader/fbreader-0.99.4-r3.ebuild b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
new file mode 100644
index 000000000000..ea2f14e6849b
--- /dev/null
+++ b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib flag-o-matic
+
+DESCRIPTION="E-Book Reader. Supports many e-book formats"
+HOMEPAGE="http://www.fbreader.org/"
+SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/liblinebreak
+	dev-libs/fribidi
+	dev-db/sqlite
+	net-misc/curl
+	sys-libs/zlib
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5[ssl]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Still use linebreak instead of new unibreak
+	sed -e "s:-lunibreak:-llinebreak:" \
+		-i makefiles/config.mk zlibrary/text/Makefile || die "fixing libunibreak failed"
+
+	# Let portage decide about the compiler
+	sed -e "/^CC = /d" \
+		-i makefiles/arch/desktop.mk || die "removing CC line failed"
+
+	# let portage strip the binary
+	sed -e '/@strip/d' \
+		-i fbreader/desktop/Makefile || die
+
+	# Respect *FLAGS
+	sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
+		-i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
+	sed -e "/^	CFLAGS +=/ d" \
+		-i makefiles/config.mk || die "CFLAGS sed failed"
+	sed -e "/^	LDFLAGS += -s$/ d" \
+		-i makefiles/config.mk || die "sed failed"
+	sed -e "/^LDFLAGS =$/ d" \
+		-i makefiles/arch/desktop.mk || die "sed failed"
+
+	echo "TARGET_ARCH = desktop" > makefiles/target.mk
+	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
+
+	echo "UI_TYPE = qt4" >> makefiles/target.mk
+	sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \
+		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
+
+	if use debug; then
+		echo "TARGET_STATUS = debug" >> makefiles/target.mk
+	else
+		echo "TARGET_STATUS = release" >> makefiles/target.mk
+	fi
+
+	# bug #452636
+	eapply "${FILESDIR}"/${P}.patch
+	# bug #515698
+	eapply "${FILESDIR}"/${P}-qreal-cast.patch
+	# bug #516794
+	eapply "${FILESDIR}"/${P}-mimetypes.patch
+	# bug #437262
+	eapply "${FILESDIR}"/${P}-ld-bfd.patch
+	# bug #592588
+	eapply -p0 "${FILESDIR}"/${P}-gcc6.patch
+
+	eapply "${FILESDIR}"/${P}-qt5.patch
+	append-cflags -std=c++11
+
+	eapply_user
+}
+
+src_compile() {
+	# bug #484516
+	emake -j1
+}
+
+src_install() {
+	default
+	dosym FBReader /usr/bin/fbreader
+}
diff --git a/app-text/fbreader/files/fbreader-0.99.4-qt5.patch b/app-text/fbreader/files/fbreader-0.99.4-qt5.patch
new file mode 100644
index 000000000000..c88e6db79d3d
--- /dev/null
+++ b/app-text/fbreader/files/fbreader-0.99.4-qt5.patch
@@ -0,0 +1,573 @@
+diff --git a/makefiles/arch/desktop.mk b/makefiles/arch/desktop.mk
+index 4267113..3b46102 100644
+--- a/makefiles/arch/desktop.mk
++++ b/makefiles/arch/desktop.mk
+@@ -12,29 +12,11 @@ AR = ar rsu
+ LD = g++
+
+ CFLAGS += -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
+-EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) 
++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)
+-endif
+-
+-ifeq "$(UI_TYPE)" "gtk"
+-  UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg
+-endif
++MOC = /usr/lib/qt5/bin/moc
++QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
++UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
+
+ RM = rm -rvf
+ RM_QUIET = rm -rf
+diff --git a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
+index 47067d3..119a5ee 100644
+--- a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
++++ b/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>
+@@ -149,12 +151,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(QString::fromStdString(pair.first), QString::fromStdString(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/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
+index a3e5b35..ab41684 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
++++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
+@@ -17,14 +17,14 @@
+  * 02110-1301, USA.
+  */
+
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QPalette>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPaintEvent>
+-#include <QtGui/QScrollBar>
+ #include <QtCore/QTimer>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
+
+ #include <QtCore/QDebug>
+
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
+index 472f05f..b9809c8 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
++++ b/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/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
+index 1cddaf9..2b65cc1 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
++++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
+@@ -18,9 +18,9 @@
+  */
+
+ #include <QtCore/QDebug>
+-#include <QtGui/QStyle>
+-#include <QtGui/QCompleter>
+-#include <QtGui/QStringListModel>
++#include <QtCore/QStringListModel>
++#include <QtWidgets/QStyle>
++#include <QtWidgets/QCompleter>
+
+ #include <ZLibrary.h>
+ #include <ZLFile.h>
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
+index 6de2c72..d942d47 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
+@@ -19,12 +19,12 @@
+ 
+ #include <algorithm>
+ 
+-#include <QtGui/QSplitter>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QScrollBar>
+ #include <QtGui/QResizeEvent>
+ #include <QtCore/QDebug>
++#include <QtWidgets/QSplitter>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
+ 
+ #include <ZLFile.h>
+ #include <ZLibrary.h>
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
+index 4f09cfc..51f1545 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
++++ b/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/zlibrary/ui/src/qt4/application/LineEditParameter.cpp b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
+index dfcbc0b..bd2689e 100644
+--- a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
++++ b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
+@@ -17,9 +17,9 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QBoxLayout>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QToolBar>
++#include <QtWidgets/QBoxLayout>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QToolBar>
+ #include <QtGui/QKeyEvent>
+ 
+ #include "ZLQtApplicationWindow.h"
+diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
+index 6241514..e0b143b 100644
+--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
++++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
+@@ -17,17 +17,17 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QImage>
+ #include <QtGui/QIcon>
+-#include <QtGui/QToolBar>
+-#include <QtGui/QMenuBar>
+-#include <QtGui/QMenu>
+-#include <QtGui/QToolButton>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QToolBar>
++#include <QtWidgets/QMenuBar>
++#include <QtWidgets/QMenu>
++#include <QtWidgets/QToolButton>
++#include <QtWidgets/QLayout>
+ #include <QtGui/QWheelEvent>
+-#include <QtGui/QDockWidget>
++#include <QtWidgets/QDockWidget>
+ #include <QtCore/QObjectList>
+ 
+ #include <ZLibrary.h>
+diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
+index 3b4fd3a..42ff2c8 100644
+--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
++++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
+@@ -22,8 +22,8 @@
+ 
+ #include <map>
+ 
+-#include <QtGui/QMainWindow>
+-#include <QtGui/QAction>
++#include <QtWidgets/QMainWindow>
++#include <QtWidgets/QAction>
+ #include <QtGui/QCursor>
+ 
+ class QDockWidget;
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
+index 24eb897..c17e86c 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
++++ b/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 <ZLDialogManager.h>
+ 
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
+index 068039d..811cec8 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
++++ b/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/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
+index e8ff422..352c350 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
++++ b/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/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
+index d5eb4d4..2fc769b 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
+@@ -17,11 +17,11 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QMessageBox>
+-#include <QtGui/QFileDialog>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QMessageBox>
++#include <QtWidgets/QFileDialog>
+ #include <QtGui/QClipboard>
+-#include <QtGui/QDesktopWidget>
++#include <QtWidgets/QDesktopWidget>
+ 
+ #include "ZLQtDialogManager.h"
+ #include "ZLQtDialog.h"
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
+index ec9e73c..a50a40d 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
++++ b/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/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
+index 48a1b8f..90d50fb 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
++++ b/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/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
+index f6c36fb..7fe855a 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
+@@ -17,11 +17,11 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QLayout>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QButtonGroup>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
++#include <QtWidgets/QLayout>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QButtonGroup>
+ #include <QtGui/QResizeEvent>
+ 
+ #include <ZLDialogManager.h>
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
+index e38b62a..ad26fba 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
+@@ -20,9 +20,9 @@
+ #ifndef __ZLQTOPTIONSDIALOG_H__
+ #define __ZLQTOPTIONSDIALOG_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QTabWidget>
+-#include <QtGui/QDialog>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QTabWidget>
++#include <QtWidgets/QDialog>
+ 
+ #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
+ 
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
+index 98e469e..5a1d574 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
++++ b/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 "../dialogs/ZLQtDialogManager.h"
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
+index df6c73b..837bce5 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
++++ b/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/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
+index 9cf7c47..03f1223 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
+@@ -24,12 +24,12 @@
+ #include <QtCore/QSet>
+ #include <QtCore/QMap>
+ 
+-#include <QtGui/QDialog>
+-#include <QtGui/QScrollArea>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QWidget>
++#include <QtWidgets/QDialog>
++#include <QtWidgets/QScrollArea>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QWidget>
+ 
+ #include <ZLTreeDialog.h>
+ 
+diff --git a/zlibrary/ui/src/qt4/library/ZLQApplication.h b/zlibrary/ui/src/qt4/library/ZLQApplication.h
+index c08c536..a714fa9 100644
+--- a/zlibrary/ui/src/qt4/library/ZLQApplication.h
++++ b/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/zlibrary/ui/src/qt4/library/ZLibrary.cpp b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
+index 9648e95..a544031 100644
+--- a/zlibrary/ui/src/qt4/library/ZLibrary.cpp
++++ b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
+@@ -19,7 +19,7 @@
+ 
+ #include <QtCore/QTextCodec>
+ #include <QtCore/QFile>
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include <QtGui/QFileOpenEvent>
+ 
+ #include <ZLApplication.h>
+@@ -72,7 +72,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/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
+index cdaef01..a259c65 100644
+--- a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
++++ b/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/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
+index 1b8ebcc..6f3b4e3 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
++++ b/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/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
+index f6e174c..c360965 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
++++ b/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/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
+index 4f5d196..615050c 100644
+--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
++++ b/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/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
+index 6fabf00..ccec1e3 100644
+--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
++++ b/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>
-- 
cgit v1.2.3