Attachment #402690 for bug #541604

Lines 41-46 Link Here

(-)qscintilla2-2.8.4+dfsg.orig/Qt4Qt5/qscintilla.pro (+1 lines)
41		41
42	greaterThan(QT_MAJOR_VERSION, 4) {	42	greaterThan(QT_MAJOR_VERSION, 4) {
43	QT += widgets printsupport	43	QT += widgets printsupport
		44	TARGET = qt5scintilla2
44		45
45	greaterThan(QT_MINOR_VERSION, 1) {	46	greaterThan(QT_MINOR_VERSION, 1) {
46	macx:QT += macextras	47	macx:QT += macextras

Lines 17-25 Link Here

(-)qscintilla2-2.8.4+dfsg.orig/Qt4Qt5/features/qscintilla2.prf (-1 / +10 lines)
17	win32: {	17	win32: {
18	LIBS += -lqscintilla2d	18	LIBS += -lqscintilla2d
19	} else {	19	} else {
20	LIBS += -lqscintilla2	20	greaterThan(QT_MAJOR_VERSION, 4) {
		21	LIBS += -lqt5scintilla2
		22	} else {
		23	LIBS += -lqscintilla2
		24	}
21	}	25	}
22	}	26	}
23	} else {	27	} else {
		28	greaterThan(QT_MAJOR_VERSION, 4) {
		29	LIBS += -lqt5scintilla2
		30	}
		31	else {
24	LIBS += -lqscintilla2	32	LIBS += -lqscintilla2
		33	}
25	}	34	}

Lines 11-18 Link Here

(-)qscintilla2-2.8.4+dfsg.orig/designer-Qt4Qt5/designer.pro (+3 lines)
11		11
12	# Work around QTBUG-39300.	12	# Work around QTBUG-39300.
13	CONFIG -= android_install	13	CONFIG -= android_install
		14	TARGET = qt5scintillaplugin
		15	LIBS += -lqt5scintilla2
14	} else {	16	} else {
15	CONFIG += designer	17	CONFIG += designer
		18	LIBS += -lqscintilla2
16	}	19	}
17		20
18	macx {	21	macx {

Return to bug 541604