-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[qscintilla] Update to 2.11.4 #10511
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
ras0219-msft
merged 16 commits into
microsoft:master
from
longhuan2018:update-port-qscintilla
Apr 17, 2020
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
4dac6c2
Merge pull request #1 from microsoft/master
longhuan2018 af60ca0
Merge pull request #3 from microsoft/master
longhuan2018 087655f
Merge pull request #4 from microsoft/master
longhuan2018 c1a19a4
Merge pull request #8 from microsoft/master
longhuan2018 657efd4
Merge pull request #9 from microsoft/master
longhuan2018 f0d6330
update qscintilla to 2.11.4
longhuan2018 40996c8
Update portfile.cmake
longhuan2018 890ff80
for CI test
longhuan2018 1f3c41c
undo
longhuan2018 d712a1c
add !osx support
longhuan2018 a9c2c32
fix osx build error
longhuan2018 96aa7d6
Update ci.baseline.txt
longhuan2018 74408f4
Merge branch 'master' into update-port-qscintilla
longhuan2018 e4a5086
Update ci.baseline.txt
longhuan2018 1d2cdf0
[ci.baseline.txt] Revert line endings change
ras0219-msft 44c2402
[qscintilla] Restore vcpkg_copy_pdbs()
ras0219-msft File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| Source: qscintilla | ||
| Version: 2.10-11 | ||
| Homepage: https://sourceforge.net/projects/pyqt | ||
| Version: 2.11.4-1 | ||
| Homepage: https://www.riverbankcomputing.com/software/qscintilla | ||
| Description: QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin) | ||
| Build-Depends: qt5-base, qt5-macextras (osx), qt5-winextras (windows) | ||
| Build-Depends: qt5-base, qt5-macextras (osx), qt5-winextras (windows) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.