Skip to content
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

merge from qgis #12

Merged
merged 2,378 commits into from
Oct 13, 2020
Merged

Conversation

longhuan2018
Copy link
Owner

No description provided.

rouault and others added 30 commits September 29, 2020 22:46
tests: replace wrong uses of unittest.skip() by unittest.skipIf()
Fixes manual mode in merge features tool
GetFeatureInfo and no data values
Check if a point is 3D before returning its z value
Instead of hijacking 'layerName' which has a different semantics.

This modifies commit 84eed01, which returns the database name in
the layerName URI component, which is not the right semantic, since
layerName should be a OGR layer name.

With this fix encodeUri() can roundtrip with decodeUri()
OGR provider: make decodeUri() set a 'databaseName' component
…quoting

PG fix relation discovery with table/schema that require quotes
Currently when defining a new OGR Database connection, one must fill
the database, host and port numbers. Some/most of them are optional on the
OGR side (for example the MYSQL driver only requires the database name,
but the PG driver could for example work without any depending on the PG
config), so do not require them at all. The 'Test connection' button is
already there for users to check they've properly filled the form.
… 'v' might be accessed at non-zero index' false-positive by making code clearer
Test for writing weak relation attributes to XML (followup #39090)
… it has pointers (but cannot be enabled because of SIP issue)
m-kuhn and others added 29 commits October 11, 2020 12:33
Background:
https://www.qt.io/blog/2011/06/13/string-concatenation-with-qstringbuilder

When enabling -DQT_USE_QSTRINGBUILDER, QString() concatenation with operator +
are done in a more efficient way, especially with repeated + operators.

Qt and creator themselves are built with that enabled.
Reusing the same color resulted in too subtle indentation guides
and move responsibility for showing warning messages to QgsCodeEditor
base class, so that the same code can be used by other dialog script editors
It's not free to calculate, and is only used when
iterating over a memory layer with a subset string set

Results in a big speed up to scripts which fire off many individual
feature requests to a memory provider layer
…sh-on-save

Don't crash on transaction save
…rType-case

OGR decodeUri: be tolerant on layerName case
…rrectly use this to set the QgsCoordinateReferenceSystem description
@longhuan2018 longhuan2018 merged commit 1f1f7c9 into longhuan2018:fix-python-3.8.3-build-failed Oct 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.