diff options
| author | Long Huan <8551701+longhuan2018@users.noreply.github.com> | 2020-04-18 06:11:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 15:11:12 -0700 |
| commit | 71377f69e255414ccf3569a8a772fc89ee9f89ff (patch) | |
| tree | 41b6b95278ce77b2b28446d94724d70881a5b468 /ports/qscintilla/fix-static.patch | |
| parent | 87ebede04135a7effa1b55c22d1b194282f6603e (diff) | |
| download | vcpkg-71377f69e255414ccf3569a8a772fc89ee9f89ff.tar.gz vcpkg-71377f69e255414ccf3569a8a772fc89ee9f89ff.zip | |
[qscintilla] Update to 2.11.4 (#10511)
* update qscintilla to 2.11.4
* Update portfile.cmake
* for CI test
* undo
* add !osx support
* fix osx build error
* Update ci.baseline.txt
* Update ci.baseline.txt
* [ci.baseline.txt] Revert line endings change
* [qscintilla] Restore vcpkg_copy_pdbs()
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/qscintilla/fix-static.patch')
| -rw-r--r-- | ports/qscintilla/fix-static.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/ports/qscintilla/fix-static.patch b/ports/qscintilla/fix-static.patch new file mode 100644 index 000000000..f3a4a616d --- /dev/null +++ b/ports/qscintilla/fix-static.patch @@ -0,0 +1,29 @@ +diff --git a/Qt4Qt5/qscintilla.pro b/Qt4Qt5/qscintilla.pro
+index 075079c32..8ff8678b6 100644
+--- a/Qt4Qt5/qscintilla.pro
++++ b/Qt4Qt5/qscintilla.pro
+@@ -37,13 +37,13 @@ CONFIG(debug, debug|release) {
+ TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}
+ }
+
+-macx:!CONFIG(staticlib) {
++macx:!CONFIG(static) {
+ QMAKE_POST_LINK += install_name_tool -id @rpath/$(TARGET1) $(TARGET)
+ }
+
+ INCLUDEPATH += . ../include ../lexlib ../src
+
+-!CONFIG(staticlib) {
++!CONFIG(static) {
+ DEFINES += QSCINTILLA_MAKE_DLL
+ }
+ DEFINES += SCINTILLA_QT SCI_LEXER INCLUDE_DEPRECATED_FEATURES
+@@ -90,7 +90,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
+ } else {
+ features.path = $$[QT_INSTALL_DATA]/mkspecs/features
+ }
+-CONFIG(staticlib) {
++CONFIG(static) {
+ features.files = $$PWD/features_staticlib/qscintilla2.prf
+ } else {
+ features.files = $$PWD/features/qscintilla2.prf
|