File qscintilla-qt5.diff of Package qscintilla-qt5
diff -ru QScintilla_gpl-2.10.orig/designer-Qt4Qt5/designer.pro QScintilla_gpl-2.10/designer-Qt4Qt5/designer.pro
--- QScintilla_gpl-2.10.orig/designer-Qt4Qt5/designer.pro 2017-02-20 07:49:30.000000000 -0500
+++ QScintilla_gpl-2.10/designer-Qt4Qt5/designer.pro 2017-02-28 20:56:09.921686055 -0500
@@ -2,9 +2,9 @@
TEMPLATE = lib
-TARGET = qscintillaplugin
+TARGET = qscintillaplugin-qt5
-CONFIG += plugin qscintilla2
+CONFIG += plugin qscintilla2-qt5
greaterThan(QT_MAJOR_VERSION, 4) {
QT += designer
@@ -24,3 +24,6 @@
target.path = $$[QT_INSTALL_PLUGINS]/designer
INSTALLS += target
+
+LIBS += -L../Qt4Qt5 -lqscintilla2-qt5
+INCLUDEPATH += ../Qt4Qt5
diff -ru QScintilla_gpl-2.10.orig/example-Qt4Qt5/application.pro QScintilla_gpl-2.10/example-Qt4Qt5/application.pro
--- QScintilla_gpl-2.10.orig/example-Qt4Qt5/application.pro 2017-02-20 07:49:30.000000000 -0500
+++ QScintilla_gpl-2.10/example-Qt4Qt5/application.pro 2017-02-28 20:56:38.169668756 -0500
@@ -1,4 +1,4 @@
-CONFIG += qscintilla2
+CONFIG += qscintilla2-qt5
macx {
QMAKE_POST_LINK = install_name_tool -change libqscintilla2_qt$${QT_MAJOR_VERSION}.13.dylib $$[QT_INSTALL_LIBS]/libqscintilla2_qt$${QT_MAJOR_VERSION}.13.dylib $(TARGET)
diff -ru QScintilla_gpl-2.10.orig/Python/configure.py QScintilla_gpl-2.10/Python/configure.py
--- QScintilla_gpl-2.10.orig/Python/configure.py 2017-02-20 07:49:30.000000000 -0500
+++ QScintilla_gpl-2.10/Python/configure.py 2017-02-28 20:35:34.261809703 -0500
@@ -303,7 +303,7 @@
version of Qt. target_configuration is the target configuration.
"""
- qmake = {'CONFIG': 'qscintilla2'}
+ qmake = {'CONFIG': 'qscintilla2-qt%s' % target_configuration.qt_version_str[0]}
if target_configuration.qsci_inc_dir is not None:
qmake['INCLUDEPATH'] = quote(target_configuration.qsci_inc_dir)
@@ -1415,6 +1415,9 @@
config = qmake_config.get('CONFIG')
if config:
pro.write('CONFIG += %s\n' % config)
+ pro.write('INCLUDEPATH += /usr/include/qt5/QtWidgets\n')
+ pro.write('INCLUDEPATH += /usr/include/qt5/QtPrintSupport\n')
+
# Work around QTBUG-39300.
pro.write('CONFIG -= android_install\n')
diff -ru QScintilla_gpl-2.10.orig/Qt4Qt5/features/qscintilla2.prf QScintilla_gpl-2.10/Qt4Qt5/features/qscintilla2.prf
--- QScintilla_gpl-2.10.orig/Qt4Qt5/features/qscintilla2.prf 2017-02-20 07:49:30.000000000 -0500
+++ QScintilla_gpl-2.10/Qt4Qt5/features/qscintilla2.prf 2017-02-28 20:52:48.757796444 -0500
@@ -19,9 +19,9 @@
win32: {
LIBS += -lqscintilla2_qt$${QT_MAJOR_VERSION}d
} else {
- LIBS += -lqscintilla2_qt$${QT_MAJOR_VERSION}
+ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
}
}
} else {
- LIBS += -lqscintilla2_qt$${QT_MAJOR_VERSION}
+ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
}
diff -ru QScintilla_gpl-2.10.orig/Qt4Qt5/qscintilla.pro QScintilla_gpl-2.10/Qt4Qt5/qscintilla.pro
--- QScintilla_gpl-2.10.orig/Qt4Qt5/qscintilla.pro 2017-02-20 07:49:30.000000000 -0500
+++ QScintilla_gpl-2.10/Qt4Qt5/qscintilla.pro 2017-02-28 20:55:12.221720078 -0500
@@ -23,7 +23,7 @@
!win32:VERSION = 13.0.0
TEMPLATE = lib
-TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}
+TARGET = qscintilla2-qt$${QT_MAJOR_VERSION}
CONFIG += qt warn_off thread exceptions hide_symbols
INCLUDEPATH += . ../include ../lexlib ../src
@@ -68,9 +68,9 @@
features.path = $$[QT_INSTALL_DATA]/mkspecs/features
}
CONFIG(staticlib) {
- features.files = $$PWD/features_staticlib/qscintilla2.prf
+ features.files = $$PWD/features_staticlib/qscintilla2-qt5.prf
} else {
- features.files = $$PWD/features/qscintilla2.prf
+ features.files = $$PWD/features/qscintilla2-qt5.prf
}
INSTALLS += features