Skip to content

Commit

Permalink
Merge pull request #581 from Esri/release/200.0.0
Browse files Browse the repository at this point in the history
Update main from 100.15 -> 200.0
  • Loading branch information
ldanzinger committed Dec 15, 2022
2 parents ce33878 + 43572a5 commit 3128772
Show file tree
Hide file tree
Showing 330 changed files with 8,633 additions and 3,946 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Expand Up @@ -16,7 +16,7 @@
# and Qt Creator 4.14.1.

Language: Cpp
Standard: c++14
Standard: c++17

# Pointers
DerivePointerAlignment: false
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
@@ -1,5 +1,8 @@
# Changelog

## 200.0
* (UtilityNetworkTrace) Introduction of the new Utility Network Trace tool (C++/Quick).

## 100.15

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

## 100.14
* `toolkitwidgets.pri`, `toolkitqml.pri`, and `toolkitcpp.pri` now include `QT += ...` lines to account for needed dependencies.
Expand Down
22 changes: 11 additions & 11 deletions CONTRIBUTING.md
@@ -1,6 +1,6 @@
# Contributing

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

For specific resources on:
Expand All @@ -14,45 +14,45 @@ You will need:

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

## Important resources

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

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

- [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).

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

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

## Submitting a change

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

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

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

### Bugfixes

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

### Feature enhancements

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

### CHANGELOG.md
Expand Down
6 changes: 3 additions & 3 deletions README.md
@@ -1,17 +1,17 @@
# ArcGIS Runtime Toolkit - Qt
# ArcGIS Maps SDK for Qt Toolkit

[![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)

## Introduction

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

## Resources

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

Expand Down

0 comments on commit 3128772

Please sign in to comment.