Qscintilla Namespace Fix#4332
Merged
ras0219-msft merged 10 commits intomicrosoft:masterfrom Oct 25, 2018
RobertBColton:qscintilla-namespace-fix
Merged
Qscintilla Namespace Fix#4332ras0219-msft merged 10 commits intomicrosoft:masterfrom RobertBColton:qscintilla-namespace-fix
ras0219-msft merged 10 commits intomicrosoft:masterfrom
RobertBColton:qscintilla-namespace-fix
Conversation
[sqlite3] Enable SQLITE_ENABLE_COLUMN_METADATA
Contributor
|
Please update QScintilla to 2.10.8 |
Contributor
|
Thanks for the PR and sorry for the long merge delay! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This fixes conflicts when using QScintilla statically. Otherwise it's possible that QScintilla will conflict with internal Qt sources.
It seems both Qt5 and QScintilla have a class named FontNames that results in this linker error when linking to QScintilla statically. This fixes that problem by making the default QScintilla configuration in VCPKG be namespaced.