Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andrey Grozin <grozin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/files/, app-text/fbreader/
Date: Fri, 20 Oct 2017 14:58:15
Message-Id: 1508511456.1c8ade17b1cc2c36b0a782a1e7d7dde2bdb64427.grozin@gentoo
1 commit: 1c8ade17b1cc2c36b0a782a1e7d7dde2bdb64427
2 Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 20 14:56:15 2017 +0000
4 Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 20 14:57:36 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c8ade17
7
8 app-text/fbreader: use Qt-5
9
10 Closes: https://bugs.gentoo.org/634780
11 Package-Manager: Portage-2.3.11, Repoman-2.3.3
12
13 app-text/fbreader/fbreader-0.99.4-r3.ebuild | 95 ++++
14 app-text/fbreader/files/fbreader-0.99.4-qt5.patch | 573 ++++++++++++++++++++++
15 2 files changed, 668 insertions(+)
16
17 diff --git a/app-text/fbreader/fbreader-0.99.4-r3.ebuild b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
18 new file mode 100644
19 index 00000000000..ea2f14e6849
20 --- /dev/null
21 +++ b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
22 @@ -0,0 +1,95 @@
23 +# Copyright 1999-2017 Gentoo Foundation
24 +# Distributed under the terms of the GNU General Public License v2
25 +
26 +EAPI=6
27 +
28 +inherit eutils multilib flag-o-matic
29 +
30 +DESCRIPTION="E-Book Reader. Supports many e-book formats"
31 +HOMEPAGE="http://www.fbreader.org/"
32 +SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
33 +
34 +LICENSE="GPL-2"
35 +SLOT="0"
36 +KEYWORDS="~amd64 ~arm ~ppc ~x86"
37 +IUSE="debug"
38 +
39 +RDEPEND="
40 + app-arch/bzip2
41 + dev-libs/expat
42 + dev-libs/liblinebreak
43 + dev-libs/fribidi
44 + dev-db/sqlite
45 + net-misc/curl
46 + sys-libs/zlib
47 + dev-qt/qtcore:5
48 + dev-qt/qtgui:5
49 + dev-qt/qtwidgets:5
50 + dev-qt/qtnetwork:5[ssl]
51 +"
52 +DEPEND="${RDEPEND}
53 + virtual/pkgconfig
54 +"
55 +
56 +src_prepare() {
57 + # Still use linebreak instead of new unibreak
58 + sed -e "s:-lunibreak:-llinebreak:" \
59 + -i makefiles/config.mk zlibrary/text/Makefile || die "fixing libunibreak failed"
60 +
61 + # Let portage decide about the compiler
62 + sed -e "/^CC = /d" \
63 + -i makefiles/arch/desktop.mk || die "removing CC line failed"
64 +
65 + # let portage strip the binary
66 + sed -e '/@strip/d' \
67 + -i fbreader/desktop/Makefile || die
68 +
69 + # Respect *FLAGS
70 + sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
71 + -i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
72 + sed -e "/^ CFLAGS +=/ d" \
73 + -i makefiles/config.mk || die "CFLAGS sed failed"
74 + sed -e "/^ LDFLAGS += -s$/ d" \
75 + -i makefiles/config.mk || die "sed failed"
76 + sed -e "/^LDFLAGS =$/ d" \
77 + -i makefiles/arch/desktop.mk || die "sed failed"
78 +
79 + echo "TARGET_ARCH = desktop" > makefiles/target.mk
80 + echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
81 +
82 + echo "UI_TYPE = qt4" >> makefiles/target.mk
83 + sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \
84 + -i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
85 +
86 + if use debug; then
87 + echo "TARGET_STATUS = debug" >> makefiles/target.mk
88 + else
89 + echo "TARGET_STATUS = release" >> makefiles/target.mk
90 + fi
91 +
92 + # bug #452636
93 + eapply "${FILESDIR}"/${P}.patch
94 + # bug #515698
95 + eapply "${FILESDIR}"/${P}-qreal-cast.patch
96 + # bug #516794
97 + eapply "${FILESDIR}"/${P}-mimetypes.patch
98 + # bug #437262
99 + eapply "${FILESDIR}"/${P}-ld-bfd.patch
100 + # bug #592588
101 + eapply -p0 "${FILESDIR}"/${P}-gcc6.patch
102 +
103 + eapply "${FILESDIR}"/${P}-qt5.patch
104 + append-cflags -std=c++11
105 +
106 + eapply_user
107 +}
108 +
109 +src_compile() {
110 + # bug #484516
111 + emake -j1
112 +}
113 +
114 +src_install() {
115 + default
116 + dosym FBReader /usr/bin/fbreader
117 +}
118
119 diff --git a/app-text/fbreader/files/fbreader-0.99.4-qt5.patch b/app-text/fbreader/files/fbreader-0.99.4-qt5.patch
120 new file mode 100644
121 index 00000000000..c88e6db79d3
122 --- /dev/null
123 +++ b/app-text/fbreader/files/fbreader-0.99.4-qt5.patch
124 @@ -0,0 +1,573 @@
125 +diff --git a/makefiles/arch/desktop.mk b/makefiles/arch/desktop.mk
126 +index 4267113..3b46102 100644
127 +--- a/makefiles/arch/desktop.mk
128 ++++ b/makefiles/arch/desktop.mk
129 +@@ -12,29 +12,11 @@ AR = ar rsu
130 + LD = g++
131 +
132 + CFLAGS += -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
133 +-EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
134 ++EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
135 +
136 +-ifeq "$(UI_TYPE)" "qt"
137 +- MOC = moc-qt3
138 +- QTINCLUDE = -I /usr/include/qt3
139 +-else
140 +- MOC = $(shell pkg-config QtCore --variable=moc_location)
141 +- QTINCLUDE = -I $(shell pkg-config --cflags QtCore)
142 +-endif
143 +-
144 +-GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft)
145 +-
146 +-ifeq "$(UI_TYPE)" "qt"
147 +- UILIBS = -lqt-mt
148 +-endif
149 +-
150 +-ifeq "$(UI_TYPE)" "qt4"
151 +- UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork)
152 +-endif
153 +-
154 +-ifeq "$(UI_TYPE)" "gtk"
155 +- UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg
156 +-endif
157 ++MOC = /usr/lib/qt5/bin/moc
158 ++QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
159 ++UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
160 +
161 + RM = rm -rvf
162 + RM_QUIET = rm -rf
163 +diff --git a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
164 +index 47067d3..119a5ee 100644
165 +--- a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
166 ++++ b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
167 +@@ -24,7 +24,9 @@
168 + #include <QtCore/QDir>
169 + #include <QtCore/QList>
170 + #include <QtCore/QTimer>
171 ++#include <QtCore/QUrlQuery>
172 +
173 ++#include <QtNetwork/QNetworkCookie>
174 + #include <QtNetwork/QNetworkRequest>
175 + #include <QtNetwork/QNetworkReply>
176 + #include <QtNetwork/QNetworkProxy>
177 +@@ -149,12 +151,12 @@ void ZLQtNetworkManager::prepareReply(ZLQtNetworkReplyScope &scope, QNetworkRequ
178 + QNetworkReply *reply = NULL;
179 + if (!scope.request->postParameters().empty()) {
180 + QByteArray data;
181 +- QUrl tmp;
182 ++ QUrlQuery tmp;
183 + typedef std::pair<std::string, std::string> string_pair;
184 + foreach (const string_pair &pair, scope.request->postParameters()) {
185 + tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second));
186 + }
187 +- data = tmp.encodedQuery();
188 ++ data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery();
189 + reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data);
190 + } else {
191 + reply = const_cast<QNetworkAccessManager&>(myManager).get(networkRequest);
192 +diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
193 +index a3e5b35..ab41684 100644
194 +--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
195 ++++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
196 +@@ -17,14 +17,14 @@
197 + * 02110-1301, USA.
198 + */
199 +
200 +-#include <QtGui/QVBoxLayout>
201 +-#include <QtGui/QHBoxLayout>
202 + #include <QtGui/QPixmap>
203 + #include <QtGui/QPalette>
204 + #include <QtGui/QPainter>
205 + #include <QtGui/QPaintEvent>
206 +-#include <QtGui/QScrollBar>
207 + #include <QtCore/QTimer>
208 ++#include <QtWidgets/QVBoxLayout>
209 ++#include <QtWidgets/QHBoxLayout>
210 ++#include <QtWidgets/QScrollBar>
211 +
212 + #include <QtCore/QDebug>
213 +
214 +diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
215 +index 472f05f..b9809c8 100644
216 +--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
217 ++++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
218 +@@ -17,10 +17,10 @@
219 + * 02110-1301, USA.
220 + */
221 +
222 +-#include <QtGui/QVBoxLayout>
223 +-#include <QtGui/QHBoxLayout>
224 +-#include <QtGui/QScrollBar>
225 +-#include <QtGui/QGraphicsDropShadowEffect>
226 ++#include <QtWidgets/QVBoxLayout>
227 ++#include <QtWidgets/QHBoxLayout>
228 ++#include <QtWidgets/QScrollBar>
229 ++#include <QtWidgets/QGraphicsDropShadowEffect>
230 +
231 + #include <QtCore/QDebug>
232 +
233 +diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
234 +index 1cddaf9..2b65cc1 100644
235 +--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
236 ++++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
237 +@@ -18,9 +18,9 @@
238 + */
239 +
240 + #include <QtCore/QDebug>
241 +-#include <QtGui/QStyle>
242 +-#include <QtGui/QCompleter>
243 +-#include <QtGui/QStringListModel>
244 ++#include <QtCore/QStringListModel>
245 ++#include <QtWidgets/QStyle>
246 ++#include <QtWidgets/QCompleter>
247 +
248 + #include <ZLibrary.h>
249 + #include <ZLFile.h>
250 +diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
251 +index 6de2c72..d942d47 100644
252 +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
253 ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
254 +@@ -19,12 +19,12 @@
255 +
256 + #include <algorithm>
257 +
258 +-#include <QtGui/QSplitter>
259 +-#include <QtGui/QVBoxLayout>
260 +-#include <QtGui/QHBoxLayout>
261 +-#include <QtGui/QScrollBar>
262 + #include <QtGui/QResizeEvent>
263 + #include <QtCore/QDebug>
264 ++#include <QtWidgets/QSplitter>
265 ++#include <QtWidgets/QVBoxLayout>
266 ++#include <QtWidgets/QHBoxLayout>
267 ++#include <QtWidgets/QScrollBar>
268 +
269 + #include <ZLFile.h>
270 + #include <ZLibrary.h>
271 +diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
272 +index 4f09cfc..51f1545 100644
273 +--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
274 ++++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
275 +@@ -20,12 +20,12 @@
276 + #ifndef __ZLQTITEMSLISTWIDGET_H__
277 + #define __ZLQTITEMSLISTWIDGET_H__
278 +
279 +-#include <QtGui/QWidget>
280 +-#include <QtGui/QFrame>
281 +-#include <QtGui/QPushButton>
282 +-#include <QtGui/QLabel>
283 +-#include <QtGui/QVBoxLayout>
284 +-#include <QtGui/QScrollArea>
285 ++#include <QtWidgets/QWidget>
286 ++#include <QtWidgets/QFrame>
287 ++#include <QtWidgets/QPushButton>
288 ++#include <QtWidgets/QLabel>
289 ++#include <QtWidgets/QVBoxLayout>
290 ++#include <QtWidgets/QScrollArea>
291 +
292 + #include <ZLTreeTitledNode.h>
293 +
294 +diff --git a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
295 +index dfcbc0b..bd2689e 100644
296 +--- a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
297 ++++ b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
298 +@@ -17,9 +17,9 @@
299 + * 02110-1301, USA.
300 + */
301 +
302 +-#include <QtGui/QBoxLayout>
303 +-#include <QtGui/QLineEdit>
304 +-#include <QtGui/QToolBar>
305 ++#include <QtWidgets/QBoxLayout>
306 ++#include <QtWidgets/QLineEdit>
307 ++#include <QtWidgets/QToolBar>
308 + #include <QtGui/QKeyEvent>
309 +
310 + #include "ZLQtApplicationWindow.h"
311 +diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
312 +index 6241514..e0b143b 100644
313 +--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
314 ++++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
315 +@@ -17,17 +17,17 @@
316 + * 02110-1301, USA.
317 + */
318 +
319 +-#include <QtGui/QApplication>
320 ++#include <QtWidgets/QApplication>
321 + #include <QtGui/QPixmap>
322 + #include <QtGui/QImage>
323 + #include <QtGui/QIcon>
324 +-#include <QtGui/QToolBar>
325 +-#include <QtGui/QMenuBar>
326 +-#include <QtGui/QMenu>
327 +-#include <QtGui/QToolButton>
328 +-#include <QtGui/QLayout>
329 ++#include <QtWidgets/QToolBar>
330 ++#include <QtWidgets/QMenuBar>
331 ++#include <QtWidgets/QMenu>
332 ++#include <QtWidgets/QToolButton>
333 ++#include <QtWidgets/QLayout>
334 + #include <QtGui/QWheelEvent>
335 +-#include <QtGui/QDockWidget>
336 ++#include <QtWidgets/QDockWidget>
337 + #include <QtCore/QObjectList>
338 +
339 + #include <ZLibrary.h>
340 +diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
341 +index 3b4fd3a..42ff2c8 100644
342 +--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
343 ++++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
344 +@@ -22,8 +22,8 @@
345 +
346 + #include <map>
347 +
348 +-#include <QtGui/QMainWindow>
349 +-#include <QtGui/QAction>
350 ++#include <QtWidgets/QMainWindow>
351 ++#include <QtWidgets/QAction>
352 + #include <QtGui/QCursor>
353 +
354 + class QDockWidget;
355 +diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
356 +index 24eb897..c17e86c 100644
357 +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
358 ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
359 +@@ -17,8 +17,8 @@
360 + * 02110-1301, USA.
361 + */
362 +
363 +-#include <QtGui/QApplication>
364 +-#include <QtGui/QPushButton>
365 ++#include <QtWidgets/QApplication>
366 ++#include <QtWidgets/QPushButton>
367 +
368 + #include <ZLDialogManager.h>
369 +
370 +diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
371 +index 068039d..811cec8 100644
372 +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
373 ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
374 +@@ -20,8 +20,8 @@
375 + #ifndef __ZLQTDIALOG_H__
376 + #define __ZLQTDIALOG_H__
377 +
378 +-#include <QtGui/QDialog>
379 +-#include <QtGui/QLayout>
380 ++#include <QtWidgets/QDialog>
381 ++#include <QtWidgets/QLayout>
382 +
383 + #include <ZLDialog.h>
384 +
385 +diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
386 +index e8ff422..352c350 100644
387 +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
388 ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
389 +@@ -17,10 +17,10 @@
390 + * 02110-1301, USA.
391 + */
392 +
393 +-#include <QtGui/QApplication>
394 +-#include <QtGui/QDesktopWidget>
395 +-#include <QtGui/QWidget>
396 +-#include <QtGui/QLayout>
397 ++#include <QtWidgets/QApplication>
398 ++#include <QtWidgets/QDesktopWidget>
399 ++#include <QtWidgets/QWidget>
400 ++#include <QtWidgets/QLayout>
401 +
402 + #include "ZLQtDialogContent.h"
403 + #include "ZLQtOptionView.h"
404 +diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
405 +index d5eb4d4..2fc769b 100644
406 +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
407 ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
408 +@@ -17,11 +17,11 @@
409 + * 02110-1301, USA.
410 + */
411 +
412 +-#include <QtGui/QApplication>
413 +-#include <QtGui/QMessageBox>
414 +-#include <QtGui/QFileDialog>
415 ++#include <QtWidgets/QApplication>
416 ++#include <QtWidgets/QMessageBox>
417 ++#include <QtWidgets/QFileDialog>
418 + #include <QtGui/QClipboard>
419 +-#include <QtGui/QDesktopWidget>
420 ++#include <QtWidgets/QDesktopWidget>
421 +
422 + #include "ZLQtDialogManager.h"
423 + #include "ZLQtDialog.h"
424 +diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
425 +index ec9e73c..a50a40d 100644
426 +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
427 ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
428 +@@ -17,7 +17,7 @@
429 + * 02110-1301, USA.
430 + */
431 +
432 +-#include <QtGui/QFileDialog>
433 ++#include <QtWidgets/QFileDialog>
434 +
435 + #include "ZLQtOpenFileDialog.h"
436 +
437 +diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
438 +index 48a1b8f..90d50fb 100644
439 +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
440 ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
441 +@@ -19,16 +19,16 @@
442 +
443 + #include <cctype>
444 +
445 +-#include <QtGui/QCheckBox>
446 +-#include <QtGui/QComboBox>
447 +-#include <QtGui/QLabel>
448 +-#include <QtGui/QGroupBox>
449 +-#include <QtGui/QRadioButton>
450 +-#include <QtGui/QPushButton>
451 +-#include <QtGui/QSpinBox>
452 +-#include <QtGui/QLineEdit>
453 +-#include <QtGui/QSlider>
454 +-#include <QtGui/QLayout>
455 ++#include <QtWidgets/QCheckBox>
456 ++#include <QtWidgets/QComboBox>
457 ++#include <QtWidgets/QLabel>
458 ++#include <QtWidgets/QGroupBox>
459 ++#include <QtWidgets/QRadioButton>
460 ++#include <QtWidgets/QPushButton>
461 ++#include <QtWidgets/QSpinBox>
462 ++#include <QtWidgets/QLineEdit>
463 ++#include <QtWidgets/QSlider>
464 ++#include <QtWidgets/QLayout>
465 +
466 + #include <ZLStringUtil.h>
467 + #include <ZLDialogManager.h>
468 +diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
469 +index f6c36fb..7fe855a 100644
470 +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
471 ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
472 +@@ -17,11 +17,11 @@
473 + * 02110-1301, USA.
474 + */
475 +
476 +-#include <QtGui/QApplication>
477 +-#include <QtGui/QDesktopWidget>
478 +-#include <QtGui/QLayout>
479 +-#include <QtGui/QPushButton>
480 +-#include <QtGui/QButtonGroup>
481 ++#include <QtWidgets/QApplication>
482 ++#include <QtWidgets/QDesktopWidget>
483 ++#include <QtWidgets/QLayout>
484 ++#include <QtWidgets/QPushButton>
485 ++#include <QtWidgets/QButtonGroup>
486 + #include <QtGui/QResizeEvent>
487 +
488 + #include <ZLDialogManager.h>
489 +diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
490 +index e38b62a..ad26fba 100644
491 +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
492 ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
493 +@@ -20,9 +20,9 @@
494 + #ifndef __ZLQTOPTIONSDIALOG_H__
495 + #define __ZLQTOPTIONSDIALOG_H__
496 +
497 +-#include <QtGui/QWidget>
498 +-#include <QtGui/QTabWidget>
499 +-#include <QtGui/QDialog>
500 ++#include <QtWidgets/QWidget>
501 ++#include <QtWidgets/QTabWidget>
502 ++#include <QtWidgets/QDialog>
503 +
504 + #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
505 +
506 +diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
507 +index 98e469e..5a1d574 100644
508 +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
509 ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
510 +@@ -19,11 +19,11 @@
511 +
512 + #include <unistd.h>
513 +
514 +-#include <QtGui/QApplication>
515 +-#include <QtGui/QDesktopWidget>
516 +-#include <QtGui/QWidget>
517 +-#include <QtGui/QLabel>
518 +-#include <QtGui/QLayout>
519 ++#include <QtWidgets/QApplication>
520 ++#include <QtWidgets/QDesktopWidget>
521 ++#include <QtWidgets/QWidget>
522 ++#include <QtWidgets/QLabel>
523 ++#include <QtWidgets/QLayout>
524 + #include <QtCore/QThreadPool>
525 +
526 + #include "../dialogs/ZLQtDialogManager.h"
527 +diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
528 +index df6c73b..837bce5 100644
529 +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
530 ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
531 +@@ -22,11 +22,11 @@
532 +
533 + #include <string>
534 +
535 +-#include <QtGui/QWidget>
536 ++#include <QtWidgets/QWidget>
537 + #include <QtGui/QCursor>
538 +-#include <QtGui/QDialog>
539 +-#include <QtGui/QProgressBar>
540 +-#include <QtGui/QLabel>
541 ++#include <QtWidgets/QDialog>
542 ++#include <QtWidgets/QProgressBar>
543 ++#include <QtWidgets/QLabel>
544 + #include <QtCore/QRunnable>
545 +
546 + #include <ZLProgressDialog.h>
547 +diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
548 +index 9cf7c47..03f1223 100644
549 +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
550 ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
551 +@@ -24,12 +24,12 @@
552 + #include <QtCore/QSet>
553 + #include <QtCore/QMap>
554 +
555 +-#include <QtGui/QDialog>
556 +-#include <QtGui/QScrollArea>
557 +-#include <QtGui/QPushButton>
558 +-#include <QtGui/QLabel>
559 +-#include <QtGui/QLineEdit>
560 +-#include <QtGui/QWidget>
561 ++#include <QtWidgets/QDialog>
562 ++#include <QtWidgets/QScrollArea>
563 ++#include <QtWidgets/QPushButton>
564 ++#include <QtWidgets/QLabel>
565 ++#include <QtWidgets/QLineEdit>
566 ++#include <QtWidgets/QWidget>
567 +
568 + #include <ZLTreeDialog.h>
569 +
570 +diff --git a/zlibrary/ui/src/qt4/library/ZLQApplication.h b/zlibrary/ui/src/qt4/library/ZLQApplication.h
571 +index c08c536..a714fa9 100644
572 +--- a/zlibrary/ui/src/qt4/library/ZLQApplication.h
573 ++++ b/zlibrary/ui/src/qt4/library/ZLQApplication.h
574 +@@ -20,7 +20,7 @@
575 + #ifndef __ZLQAPPLICATION_H__
576 + #define __ZLQAPPLICATION_H__
577 +
578 +-#include <QtGui/QApplication>
579 ++#include <QtWidgets/QApplication>
580 +
581 + class ZLQApplication : public QApplication {
582 +
583 +diff --git a/zlibrary/ui/src/qt4/library/ZLibrary.cpp b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
584 +index 9648e95..a544031 100644
585 +--- a/zlibrary/ui/src/qt4/library/ZLibrary.cpp
586 ++++ b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
587 +@@ -19,7 +19,7 @@
588 +
589 + #include <QtCore/QTextCodec>
590 + #include <QtCore/QFile>
591 +-#include <QtGui/QApplication>
592 ++#include <QtWidgets/QApplication>
593 + #include <QtGui/QFileOpenEvent>
594 +
595 + #include <ZLApplication.h>
596 +@@ -72,7 +72,7 @@ bool ZLQApplication::event(QEvent *e) {
597 + void ZLQtLibraryImplementation::init(int &argc, char **&argv) {
598 + new ZLQApplication(argc, argv);
599 +
600 +- QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8"));
601 ++ QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
602 +
603 + ZLibrary::parseArguments(argc, argv);
604 +
605 +diff --git a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
606 +index cdaef01..a259c65 100644
607 +--- a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
608 ++++ b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
609 +@@ -3,7 +3,7 @@
610 +
611 + #include <QtCore/QTimer>
612 +
613 +-#include <QtGui/QWidget>
614 ++#include <QtWidgets/QWidget>
615 + #include <QtGui/QColor>
616 +
617 + class QtWaitingSpinner : public QWidget {
618 +diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
619 +index 1b8ebcc..6f3b4e3 100644
620 +--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
621 ++++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
622 +@@ -20,11 +20,11 @@
623 + #ifndef __ZLQTPREVIEWWIDGET_H__
624 + #define __ZLQTPREVIEWWIDGET_H__
625 +
626 +-#include <QtGui/QWidget>
627 +-#include <QtGui/QPushButton>
628 +-#include <QtGui/QLabel>
629 +-#include <QtGui/QScrollArea>
630 +-#include <QtGui/QVBoxLayout>
631 ++#include <QtWidgets/QWidget>
632 ++#include <QtWidgets/QPushButton>
633 ++#include <QtWidgets/QLabel>
634 ++#include <QtWidgets/QScrollArea>
635 ++#include <QtWidgets/QVBoxLayout>
636 + #include <QtCore/QSet>
637 +
638 + #include <ZLTreePageNode.h>
639 +diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
640 +index f6e174c..c360965 100644
641 +--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
642 ++++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
643 +@@ -21,8 +21,8 @@
644 + #define __ZLQTSEARCHFIELD_H__
645 +
646 + #include <QtCore/QSet>
647 +-#include <QtGui/QLabel>
648 +-#include <QtGui/QLineEdit>
649 ++#include <QtWidgets/QLabel>
650 ++#include <QtWidgets/QLineEdit>
651 +
652 + #include "QtWaitingSpinner.h"
653 + #include "ZLQtItemsListWidget.h"
654 +diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
655 +index 4f5d196..615050c 100644
656 +--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
657 ++++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
658 +@@ -19,8 +19,8 @@
659 +
660 + #include <algorithm>
661 +
662 +-#include <QtGui/QLayout>
663 +-#include <QtGui/QScrollBar>
664 ++#include <QtWidgets/QLayout>
665 ++#include <QtWidgets/QScrollBar>
666 + #include <QtGui/QPainter>
667 + #include <QtGui/QPixmap>
668 + #include <QtGui/QMouseEvent>
669 +@@ -185,11 +185,11 @@ void ZLQtViewWidget::repaint() {
670 +
671 + void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
672 + if (direction == ZLView::VERTICAL) {
673 +- myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
674 +- myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
675 ++ myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight);
676 ++ myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight);
677 + } else {
678 +- myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
679 +- myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
680 ++ myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom);
681 ++ myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom);
682 + }
683 + }
684 +
685 +diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
686 +index 6fabf00..ccec1e3 100644
687 +--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
688 ++++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
689 +@@ -20,7 +20,7 @@
690 + #ifndef __ZLQTVIEWWIDGET_H__
691 + #define __ZLQTVIEWWIDGET_H__
692 +
693 +-#include <QtGui/QWidget>
694 ++#include <QtWidgets/QWidget>
695 +
696 + #include "../../../../core/src/view/ZLViewWidget.h"
697 + #include <ZLApplication.h>
Report Message
Find on MARC Find on Google Groups