Attachment #513610 for bug #641850

View | Details | Raw Unified | Return to bug 641850
Collapse All | Expand All

Line Link Here

(-)file_not_specified_in_diff (-27 / +29 lines)
	Enough changes to make things build with Qt5		Enough changes to make things build with Qt5
1	--	1	++ diffpdf-2.1.3/aboutform.cpp
2	-- diffpdf-2.1.3.orig/aboutform.cpp
Lines 11-17 Link Here
11	*/	11	*/
12		12
13	#include "aboutform.hpp"	13	#include "aboutform.hpp"
14	#include <poppler-version.h>
15	#include <QApplication>	14	#include <QApplication>
16	#include <QHBoxLayout>	15	#include <QHBoxLayout>
17	#include <QSettings>	16	#include <QSettings>
Lines 52-58 AboutForm::AboutForm(QWidget *parent) : Link Here
52	"</ul>"	51	"</ul>"
53	"I also provide training and consultancy in C++, Go, Python 2, "	52	"I also provide training and consultancy in C++, Go, Python 2, "
54	"Python 3, C++/Qt, and PyQt4.").arg(qApp->applicationName())	53	"Python 3, C++/Qt, and PyQt4.").arg(qApp->applicationName())
55	.arg(Version).arg(qVersion()).arg(POPPLER_VERSION));	54	.arg(Version).arg(qVersion()).arg("Qt 5"));
56	QTextBrowser *contributorsBrowser = new QTextBrowser;	55	QTextBrowser *contributorsBrowser = new QTextBrowser;
57	contributorsBrowser->setReadOnly(true);	56	contributorsBrowser->setReadOnly(true);
58	contributorsBrowser->setHtml(tr("<table>"	57	contributorsBrowser->setHtml(tr("<table>"
59	-- diffpdf-2.1.3.orig/diffpdf.pro	58	++ diffpdf-2.1.3/diffpdf.pro
Lines 31-65 TRANSLATIONS += diffpdf_fr.ts Link Here
31	TRANSLATIONS += diffpdf_de.ts	31	TRANSLATIONS += diffpdf_de.ts
32	TRANSLATIONS += diffpdf_es.ts	32	TRANSLATIONS += diffpdf_es.ts
33	CODECFORTR = UTF-8	33	CODECFORTR = UTF-8
34	LIBS += -lpoppler-qt4	34	LIBS += -lpoppler-qt5
		35	QMAKE_CFLAGS += $$(CPPFLAGS) $$(CFLAGS)
		36	QMAKE_CXXFLAGS += $$(CPPFLAGS) $$(CXXFLAGS)
		37	QMAKE_LFLAGS += $$(LDFLAGS)
		38	QT += widgets printsupport
35	win32 {	39	win32 {
36	CONFIG += release	40	CONFIG += release
37	}	41	}
38	exists($(HOME)/opt/poppler024/) {	42	exists($(HOME)/opt/poppler024/) {
39	message(Using locally built Poppler library)	43	message(Using locally built Poppler library)
40	INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/cpp	44	INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/cpp
41	INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/qt4	45	INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/qt5
42	LIBS += -Wl,-rpath -Wl,$(HOME)/opt/poppler024/lib -L$(HOME)/opt/poppler024/lib	46	LIBS += -Wl,-rpath -Wl,$(HOME)/opt/poppler024/lib -L$(HOME)/opt/poppler024/lib
43	} else {	47	} else {
44	exists(/poppler_lib) {	48	exists(/poppler_lib) {
45	message(Using locally built Poppler library on Windows)	49	message(Using locally built Poppler library on Windows)
46	INCLUDEPATH += /c/poppler_lib/include/poppler/cpp	50	INCLUDEPATH += /c/poppler_lib/include/poppler/cpp
47	INCLUDEPATH += /c/poppler_lib/include/poppler/qt4	51	INCLUDEPATH += /c/poppler_lib/include/poppler/qt5
48	LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin	52	LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin
49	} else {	53	} else {
50	exists(/usr/include/poppler/qt4) {	54	exists(/usr/include/poppler/qt5) {
51	INCLUDEPATH += /usr/include/poppler/cpp	55	INCLUDEPATH += /usr/include/poppler/cpp
52	INCLUDEPATH += /usr/include/poppler/qt4	56	INCLUDEPATH += /usr/include/poppler/qt5
53	} else {	57	} else {
54	INCLUDEPATH += /usr/local/include/poppler/cpp	58	INCLUDEPATH += /usr/local/include/poppler/cpp
55	INCLUDEPATH += /usr/local/include/poppler/qt4	59	INCLUDEPATH += /usr/local/include/poppler/qt5
56	}	60	}
57	}	61	}
58	}	62	}
59	#exists($(HOME)/opt/podofo09/) {	63	#exists($(HOME)/opt/podofo09/) {
60	# message(Using locally built PoDoFo library)	64	# message(Using locally built PoDoFo library)
61	# INCLUDEPATH += $(HOME)/opt/podofo09/include/poppler/cpp	65	# INCLUDEPATH += $(HOME)/opt/podofo09/include/poppler/cpp
62	# INCLUDEPATH += $(HOME)/opt/podofo09/include/poppler/qt4	66	# INCLUDEPATH += $(HOME)/opt/podofo09/include/poppler/qt5
63	# LIBS += -Wl,-rpath -Wl,$(HOME)/opt/podofo09/lib64 -Wl,-L$(HOME)/opt/podofo09/lib64	67	# LIBS += -Wl,-rpath -Wl,$(HOME)/opt/podofo09/lib64 -Wl,-L$(HOME)/opt/podofo09/lib64
64	#} else {	68	#} else {
65	# exists(/usr/include/podofo) {	69	# exists(/usr/include/podofo) {
66	-- diffpdf-2.1.3.orig/generic.hpp	70	++ diffpdf-2.1.3/generic.hpp
Lines 12-18 Link Here
12	for more details.	12	for more details.
13	*/	13	*/
14		14
15	#include <poppler-qt4.h>	15	#include <poppler-qt5.h>
16	#include <QMetaType>	16	#include <QMetaType>
17	#include <QPair>	17	#include <QPair>
18	#include <QPixmap>	18	#include <QPixmap>
19	-- diffpdf-2.1.3.orig/helpform.cpp	19	++ diffpdf-2.1.3/helpform.cpp
Lines 11-17 Link Here
11	*/	11	*/
12		12
13	#include "helpform.hpp"	13	#include "helpform.hpp"
14	#include <poppler-version.h>
15	#include <QApplication>	14	#include <QApplication>
16	#include <QFile>	15	#include <QFile>
17	#include <QKeySequence>	16	#include <QKeySequence>
18	-- diffpdf-2.1.3.orig/label.cpp	17	++ diffpdf-2.1.3/label.cpp
Lines 15-20 Link Here
15	#include <QDragEnterEvent>	15	#include <QDragEnterEvent>
16	#include <QDragEnterEvent>	16	#include <QDragEnterEvent>
17	#include <QMouseEvent>	17	#include <QMouseEvent>
		18	#include <QMimeData>
18		19
19	Label::Label(QWidget *parent) : QLabel(parent)	20	Label::Label(QWidget *parent) : QLabel(parent)
20	{	21	{
21	-- diffpdf-2.1.3.orig/lineedit.cpp	22	++ diffpdf-2.1.3/lineedit.cpp
Lines 14-19 Link Here
14	#include "lineedit.hpp"	14	#include "lineedit.hpp"
15	#include <QDragEnterEvent>	15	#include <QDragEnterEvent>
16	#include <QDragEnterEvent>	16	#include <QDragEnterEvent>
		17	#include <QMimeData>
17		18
18		19
19	LineEdit::LineEdit(QWidget *parent) : QLineEdit(parent)	20	LineEdit::LineEdit(QWidget *parent) : QLineEdit(parent)
20	-- diffpdf-2.1.3.orig/main.cpp	21	++ diffpdf-2.1.3/main.cpp
Lines 31-37 int main(int argc, char *argv[]) Link Here
31	app.setOrganizationDomain("qtrac.eu");	31	app.setOrganizationDomain("qtrac.eu");
32	app.setApplicationName("DiffPDF");	32	app.setApplicationName("DiffPDF");
33	app.setWindowIcon(QIcon(":/icon.png"));	33	app.setWindowIcon(QIcon(":/icon.png"));
34	QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
35		34
36	QTextStream out(stdout);	35	QTextStream out(stdout);
37	QStringList args = app.arguments().mid(1);	36	QStringList args = app.arguments().mid(1);
38	-- diffpdf-2.1.3.orig/mainwindow.hpp	37	++ diffpdf-2.1.3/mainwindow.hpp
Lines 19-25 Link Here
19	#else	19	#else
20	#include <tr1/memory>	20	#include <tr1/memory>
21	#endif	21	#endif
22	#include <poppler-qt4.h>	22	#include <poppler-qt5.h>
23	#include <QBrush>	23	#include <QBrush>
24	#include <QList>	24	#include <QList>
25	#include <QMainWindow>	25	#include <QMainWindow>
26	-- diffpdf-2.1.3.orig/optionsform.cpp	26	++ diffpdf-2.1.3/optionsform.cpp
Lines 76-84 void OptionsForm::createWidgets() Link Here
76	<< qMakePair(tr("Diagonal \\"), Qt::FDiagPattern)	76	<< qMakePair(tr("Diagonal \\"), Qt::FDiagPattern)
77	<< qMakePair(tr("Diagonal Cross"), Qt::DiagCrossPattern))	77	<< qMakePair(tr("Diagonal Cross"), Qt::DiagCrossPattern))
78	brushStyleComboBox->addItem(brushSwatch(pair.second, color),	78	brushStyleComboBox->addItem(brushSwatch(pair.second, color),
79	pair.first, pair.second);	79	pair.first, QVariant::fromValue(pair.second));
80	brushStyleComboBox->setCurrentIndex(brushStyleComboBox->findData(	80	brushStyleComboBox->setCurrentIndex(brushStyleComboBox->findData(
81	brush.style()));	81	QVariant::fromValue(brush.style())));
82		82
83	penStyleComboBox = new QComboBox;	83	penStyleComboBox = new QComboBox;
84	typedef QPair<QString, Qt::PenStyle> PenPair;	84	typedef QPair<QString, Qt::PenStyle> PenPair;
Lines 90-98 void OptionsForm::createWidgets() Link Here
90	<< qMakePair(tr("Dash-Dotted"), Qt::DashDotLine)	90	<< qMakePair(tr("Dash-Dotted"), Qt::DashDotLine)
91	<< qMakePair(tr("Dash-Dot-Dotted"), Qt::DashDotDotLine))	91	<< qMakePair(tr("Dash-Dot-Dotted"), Qt::DashDotDotLine))
92	penStyleComboBox->addItem(penStyleSwatch(pair.second, color),	92	penStyleComboBox->addItem(penStyleSwatch(pair.second, color),
93	pair.first, pair.second);	93	pair.first, QVariant::fromValue(pair.second));
94	penStyleComboBox->setCurrentIndex(penStyleComboBox->findData(	94	penStyleComboBox->setCurrentIndex(penStyleComboBox->findData(
95	pen.style()));	95	QVariant::fromValue(pen.style())));
96		96
97	alphaSpinBox = new QSpinBox;	97	alphaSpinBox = new QSpinBox;
98	alphaSpinBox->setRange(1, 100);	98	alphaSpinBox->setRange(1, 100);

Return to bug 641850