blob: 2e87efbdc64d6fa6d6287de00640c5cc75ff4202 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
diff -Nur qscintilla-2.11.6/Qt4Qt5/Qsci/qsciglobal.h qscintilla-2.11.6/Qt4Qt5/Qsci/qsciglobal.h
--- qscintilla-2.11.6/Qt4Qt5/Qsci/qsciglobal.h 2019-06-27 13:40:05.000000000 +0800
+++ qscintilla-2.11.6/Qt4Qt5/Qsci/qsciglobal.h 2019-06-25 20:49:27.000000000 +0800
@@ -28,11 +28,15 @@
#define QSCINTILLA_VERSION_STR "2.11.6"
-// 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.6/Qt4Qt5/qscintilla.pro qscintilla-2.11.6/Qt4Qt5/qscintilla.pro
--- qscintilla-2.11.6/Qt4Qt5/qscintilla.pro 2021-01-06 10:52:53.000000000 +0800
+++ qscintilla-2.11.6/Qt4Qt5/qscintilla.pro 2025-01-05 18:47:19.443415100 +0800
@@ -72,18 +72,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
@@ -95,6 +97,7 @@
} else {
features.files = $$PWD/features/qscintilla2.prf
}
+INSTALLS += features
HEADERS = \
./Qsci/qsciglobal.h \
|
