diff options
| author | CoprDistGit <infra@openeuler.org> | 2025-01-05 10:57:14 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2025-01-05 10:57:14 +0000 |
| commit | 64c7efdae40182d09c67509fee352ce1ad1f214f (patch) | |
| tree | a4cfbabca679c7ff232587a7036744bc1e840555 /fix-build-error.patch | |
| parent | 088eeedca632c8650ed49dd48c5595bfe7925510 (diff) | |
automatic import of qscintilla
Diffstat (limited to 'fix-build-error.patch')
| -rw-r--r-- | fix-build-error.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/fix-build-error.patch b/fix-build-error.patch new file mode 100644 index 0000000..2e87efb --- /dev/null +++ b/fix-build-error.patch @@ -0,0 +1,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 \ |