fbreader qt5

--- fbreader.old/makefiles/arch/desktop.mk      2016-03-13 12:36:50.000000000 -0300
+++ fbreader/makefiles/arch/desktop.mk  2016-03-13 12:51:42.214754948 -0300
@@ -16,27 +16,9 @@ CFLAGS = -pipe -fno-exceptions -Wall -Wn
 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)
-endif
-
-ifeq "$(UI_TYPE)" "gtk"
-  UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg
-endif
+MOC = moc
+QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
+UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)

 RM = rm -rvf
 RM_QUIET = rm -rf

--- fbreader.old/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp     2016-03-13 13:55:38.000000000 -0300
+++ fbreader/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp 2016-03-13 14:11:49.233297356 -0300
@@ -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(ZL
        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);
--- fbreader.old/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp 2016-03-13 14:14:03.000000000 -0300
+++ fbreader/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp     2016-03-13 14:16:09.394213011 -0300
@@ -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>

--- fbreader.old/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp       2016-03-13 14:18:15.450502907 -0300
+++ fbreader/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp   2016-03-13 14:22:01.264029439 -0300
@@ -17,13 +17,13 @@
  * 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 <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QScrollBar>

 #include <ZLibrary.h>
 #include <ZLNetworkManager.h>
--- fbreader.old/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp   2016-03-13 14:18:02.410523226 -0300
+++ fbreader/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp       2016-03-13 14:20:47.667198290 -0300
@@ -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 <ZLResource.h>
 #include <ZLOptions.h>