58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
|
diff -Nur qscintilla-2.11.2/Qt4Qt5/Qsci/qsciglobal.h QScintilla_gpl-2.11.2/Qt4Qt5/Qsci/qsciglobal.h
|
||
|
|
--- qscintilla-2.11.2/Qt4Qt5/Qsci/qsciglobal.h 2019-06-27 13:40:05.000000000 +0800
|
||
|
|
+++ QScintilla_gpl-2.11.2/Qt4Qt5/Qsci/qsciglobal.h 2019-06-25 20:49:27.000000000 +0800
|
||
|
|
@@ -28,11 +28,15 @@
|
||
|
|
#define QSCINTILLA_VERSION_STR "2.11.2"
|
||
|
|
|
||
|
|
|
||
|
|
-// Define QSCINTILLA_MAKE_DLL to create a QScintilla shared library.
|
||
|
|
-#ifdef QSCINTILLA_MAKE_DLL
|
||
|
|
- #define QSCINTILLA_EXPORT Q_DECL_EXPORT
|
||
|
|
+// Define QSCINTILLA_MAKE_DLL to create a QScintilla shared library, or
|
||
|
|
+// define QSCINTILLA_DLL to link against a QScintilla shared library, or define
|
||
|
|
+// neither to either build or link against a static QScintilla library.
|
||
|
|
+#if defined(QSCINTILLA_DLL)
|
||
|
|
+#define QSCINTILLA_EXPORT Q_DECL_IMPORT
|
||
|
|
+#elif defined(QSCINTILLA_MAKE_DLL)
|
||
|
|
+#define QSCINTILLA_EXPORT Q_DECL_EXPORT
|
||
|
|
#else
|
||
|
|
- #define QSCINTILLA_EXPORT Q_DECL_IMPORT
|
||
|
|
+#define QSCINTILLA_EXPORT
|
||
|
|
#endif
|
||
|
|
|
||
|
|
|
||
|
|
diff -Nur qscintilla-2.11.2/Qt4Qt5/qscintilla.pro QScintilla_gpl-2.11.2/Qt4Qt5/qscintilla.pro
|
||
|
|
--- qscintilla-2.11.2/Qt4Qt5/qscintilla.pro 2019-06-27 13:40:05.000000000 +0800
|
||
|
|
+++ QScintilla_gpl-2.11.2/Qt4Qt5/qscintilla.pro 2019-06-25 20:49:27.000000000 +0800
|
||
|
|
@@ -68,18 +68,20 @@
|
||
|
|
# Scintilla namespace rather than pollute the global namespace.
|
||
|
|
#DEFINES += SCI_NAMESPACE
|
||
|
|
|
||
|
|
-target.path = $$INSTALL_DIR/lib
|
||
|
|
+target.path = $$[QT_INSTALL_LIBS]
|
||
|
|
INSTALLS += target
|
||
|
|
|
||
|
|
-header.path = $$INSTALL_DIR/include
|
||
|
|
+header.path = $$[QT_INSTALL_HEADERS]
|
||
|
|
header.files = Qsci
|
||
|
|
INSTALLS += header
|
||
|
|
|
||
|
|
trans.path = $$[QT_INSTALL_TRANSLATIONS]
|
||
|
|
trans.files = qscintilla_*.qm
|
||
|
|
+INSTALLS += trans
|
||
|
|
|
||
|
|
qsci.path = $$[QT_INSTALL_DATA]
|
||
|
|
qsci.files = ../qsci
|
||
|
|
+INSTALLS += qsci
|
||
|
|
|
||
|
|
greaterThan(QT_MAJOR_VERSION, 4) {
|
||
|
|
features.path = $$[QT_HOST_DATA]/mkspecs/features
|
||
|
|
@@ -91,6 +93,7 @@
|
||
|
|
} else {
|
||
|
|
features.files = $$PWD/features/qscintilla2.prf
|
||
|
|
}
|
||
|
|
+INSTALLS += features
|
||
|
|
|
||
|
|
HEADERS = \
|
||
|
|
./Qsci/qsciglobal.h \
|