Skip to content

Commit 3128772

Browse files
authored
Merge pull request #581 from Esri/release/200.0.0
Update main from 100.15 -> 200.0
2 parents ce33878 + 43572a5 commit 3128772

File tree

330 files changed

+8633
-3946
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

330 files changed

+8633
-3946
lines changed

.clang-format

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# and Qt Creator 4.14.1.
1717

1818
Language: Cpp
19-
Standard: c++14
19+
Standard: c++17
2020

2121
# Pointers
2222
DerivePointerAlignment: false

CHANGELOG.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## 200.0
4+
* (UtilityNetworkTrace) Introduction of the new Utility Network Trace tool (C++/Quick).
5+
36
## 100.15
47

58
* (Callout) Deprecated `calloutContent` property in favour of `contentItem` usage.
@@ -9,7 +12,7 @@
912
* Added a `CONTRIBUTING.md`.
1013
* Added a `.clang-format` file.
1114
* Added vscode/spellchecking for documentation purposes.
12-
* (BookmarksView) Introduction of new Bookmark tool (C++/Quick, QML/Quick, Widget)
15+
* (BookmarksView) Introduction of new Bookmark tool (C++/Quick, QML/Quick, Widget).
1316

1417
## 100.14
1518
* `toolkitwidgets.pri`, `toolkitqml.pri`, and `toolkitcpp.pri` now include `QT += ...` lines to account for needed dependencies.

CONTRIBUTING.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing
22

3-
Welcome to the contributors' guide on the ArcGIS Runtime toolkit! We hope this document
3+
Welcome to the contributors' guide on the ArcGIS Maps SDK for Qt Toolkit! We hope this document
44
encourages you to help improve and expand upon our toolkit offering.
55

66
For specific resources on:
@@ -14,45 +14,45 @@ You will need:
1414

1515
- System requirements as laid out [here](https://developers.arcgis.com/qt/reference/system-requirements/)
1616
for your development platform.
17-
- Latest version of the [ArcGIS Runtime SDK](https://developers.arcgis.com/qt/).
17+
- Latest version of the [ArcGIS Maps SDK for Qt](https://developers.arcgis.com/qt/).
1818

1919
## Important resources
2020

21-
- The [Qt ArcGIS Runtime API Reference](https://developers.arcgis.com/qt/api-reference/). Which includes:
21+
- The [ArcGIS Maps SDK for Qt Reference](https://developers.arcgis.com/qt/api-reference/). Which includes:
2222
- [Qt Toolkit API](https://developers.arcgis.com/qt/toolkit/api-reference/).
2323
- [QML API](https://developers.arcgis.com/qt/qml/api-reference/).
2424
- [C++ API](https://developers.arcgis.com/qt/cpp/api-reference/).
2525

26-
- The [Qt ArcGIS Runtime Guide](https://developers.arcgis.com/qt/).
26+
- The [ArcGIS Maps SDK for Qt Guide](https://developers.arcgis.com/qt/).
2727

2828
- [Qt's board on Esri Community](https://community.esri.com/t5/arcgis-runtime-sdk-for-qt-questions/bd-p/arcgis-runtime-sdk-for-qt-questions).
2929

3030
- [Official Qt documentation](https://doc.qt.io/).
3131

32-
- [DSA App](https://github.com/Esri/dynamic-situational-awareness-qt), an open source project built with the ArcGIS Runtime Toolkit for Qt.
32+
- [DSA App](https://github.com/Esri/dynamic-situational-awareness-qt), an open source project built with the ArcGIS Maps SDK for Qt Toolkit.
3333

3434
## Submitting a change
3535

3636
There are two active branches within toolkit: `main` and `v.next`.
3737

38-
- **main** is the active branch, and must always be compatible with
39-
the [release version of ArcGIS Runtime for Qt](https://developers.arcgis.com/qt/). This is
38+
- **main** is the active branch, and must always be compatible with
39+
the [release version of ArcGIS Maps SDK for Qt](https://developers.arcgis.com/qt/). This is
4040
the main branch all our users consume to access toolkit features.
4141

4242
- **v.next** is the "next version" branch which contains upcoming features and is
43-
compatible with the upcoming version of ArcGIS Runtime. While anyone may contribute to this
43+
compatible with the upcoming version of the ArcGIS Maps SDK. While anyone may contribute to this
4444
branch, public contributors outside of Esri will not be able to build this branch as the upcoming
45-
version of ArcGIS Runtime will be unavailable.
45+
version of ArcGIS Maps SDK will be unavailable.
4646

4747
### Bugfixes
4848

4949
If you are contributing a bugfix, and you believe the bug is high priority
50-
in impact, then target the **main** branch in your PR. Otherwise consider targeting **v.next**!
50+
in impact, then target the **main** branch in your PR. Otherwise consider targeting **v.next**!
5151
If unsure, the PR reviewer can help make the right call.
5252

5353
### Feature enhancements
5454

55-
Once you have implemented a new feature, and are ready for a pull-request, please target the **v.next** branch.
55+
Once you have implemented a new feature, and are ready for a pull-request, please target the **v.next** branch.
5656
This helps the toolkit team verify the feature is production ready before we ship!
5757

5858
### CHANGELOG.md

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# ArcGIS Runtime Toolkit - Qt
1+
# ArcGIS Maps SDK for Qt Toolkit
22

33
[![API reference](https://img.shields.io/badge/API_Reference-purple)](https://developers.arcgis.com/qt/latest/toolkit/api-reference/) [![Current release](https://img.shields.io/github/v/release/esri/arcgis-runtime-toolkit-qt?label=current%20release)](https://github.com/Esri/arcgis-runtime-toolkit-qt/releases)
44

55
## Introduction
66

7-
This toolkit is an open source resource intended for use with the ArcGIS Runtime
7+
This toolkit is an open source resource intended for use with the ArcGIS Maps
88
SDK for Qt. It provides ready made components to complement mapping and GIS
99
applications. Because it is open source you are encouraged to modify these tools
1010
and add your own.
1111

1212
## Resources
1313

14-
* [ArcGIS Runtime SDK for Qt](https://developers.arcgis.com/qt/)
14+
* [ArcGIS Maps SDK for Qt](https://developers.arcgis.com/qt/)
1515
* [System requirements](https://developers.arcgis.com/qt/latest/qml/guide/system-requirements.htm)
1616
* [Qt and QML](http://www.qt.io/)
1717

0 commit comments

Comments
 (0)