James/100 6 (#322)

* 100.6 version update.

* More versioning changes.

* Updates for more versioning changes.

* Only current version should be updated.

Author: JamesMBallard

Examples/CalloutExample.qml

@@ -18,9 +18,9 @@ import QtQuick 2.11
 import QtQuick.Controls 2.4
 import QtPositioning 5.8
 import QtSensors 5.9
-import Esri.ArcGISRuntime 100.5
+import Esri.ArcGISRuntime 100.6
 import Esri.ArcGISExtras 1.1
-import Esri.ArcGISRuntime.Toolkit.Controls 100.5
+import Esri.ArcGISRuntime.Toolkit.Controls 100.6
 
 Rectangle {
     width: 800

Examples/Examples.qml

@@ -17,7 +17,7 @@
 import QtQuick 2.11
 import QtQuick.Controls 2.4
 import QtGraphicalEffects 1.0
-import Esri.ArcGISRuntime 100.5
+import Esri.ArcGISRuntime 100.6
 
 Rectangle {
     width: 640

Examples/PopupExample.qml

@@ -19,9 +19,9 @@ import QtQuick.Controls 2.4
 import QtPositioning 5.8
 import QtSensors 5.9
 import QtQuick.Dialogs 1.2
-import Esri.ArcGISRuntime 100.5
+import Esri.ArcGISRuntime 100.6
 import Esri.ArcGISExtras 1.1
-import Esri.ArcGISRuntime.Toolkit.Controls 100.5
+import Esri.ArcGISRuntime.Toolkit.Controls 100.6
 
 Rectangle {
     id: root

Import/Esri/ArcGISRuntime/Toolkit/Controls/CppApi/qmldir

@@ -22,4 +22,4 @@ ArcGISCompass 100.2 ArcGISCompass1002.qml
 ArcGISCompass 100.5 ArcGISCompass.qml
 TimeSlider 100.3 TimeSlider1003.qml
 TimeSlider 100.5 TimeSlider.qml
-CurrentVersion 100.5 CurrentVersion.qml
+CurrentVersion 100.6 CurrentVersion.qml

Import/Esri/ArcGISRuntime/Toolkit/Controls/QmlApi/qmldir

@@ -20,4 +20,4 @@ TimeSlider 100.3 TimeSlider1003.qml
 TimeSlider 100.5 TimeSlider.qml
 internal TimeSlider1003 TimeSliderController1003.qml
 internal TimeSlider TimeSliderController.qml
-CurrentVersion 100.5 CurrentVersion.qml
+CurrentVersion 100.6 CurrentVersion.qml

Import/Esri/ArcGISRuntime/Toolkit/Controls/qmldir

@@ -22,7 +22,7 @@ Callout 2.0 Callout20.qml
 Callout 100.0 Callout100.qml
 Callout 100.1 Callout1001.qml
 Callout 100.5 Callout.qml
-CurrentVersion 100.5 CurrentVersion.qml
+CurrentVersion 100.6 CurrentVersion.qml
 Fader 2.0 Fader20.qml
 HomeButton 2.0 HomeButton20.qml
 ImageButton 2.0 ImageButton20.qml

Import/Esri/ArcGISRuntime/Toolkit/Dialogs/qmldir

@@ -22,7 +22,7 @@ AuthenticationView 100.5 AuthenticationView.qml
 ClientCertificateView 2.0 ClientCertificateView20.qml
 ClientCertificateView 100.0 ClientCertificateView100.qml
 ClientCertificateView 100.5 ClientCertificateView.qml
-CurrentVersion 100.5 CurrentVersion.qml
+CurrentVersion 100.6 CurrentVersion.qml
 ImagePopUpDialog 2.0 ImagePopUpDialog20.qml
 OAuth2View 2.0 OAuth2View20.qml
 OAuth2View 100.0 OAuth2View100.qml

Plugin/CppApi/ArcGISRuntimeToolkit.pro

@@ -32,7 +32,7 @@ INCLUDEPATH += $$PWD/include/ \
 
 RUNTIME_PRI = arcgis_runtime_qml_cpp.pri
 #RUNTIME_PRI = esri_runtime_qt.pri # use this for widgets
-ARCGIS_RUNTIME_VERSION = 100.5
+ARCGIS_RUNTIME_VERSION = 100.6
 
 !CONFIG(daily) {
   include($$PWD/arcgisruntime.pri)

README.md

@@ -1,7 +1,7 @@
 ArcGIS Runtime API Toolkit
 ==========================
 
-Current Release: 100.5
+Current Release: 100.6
 
 This project contains QML source code for controls and utilities you can use with the [ArcGIS Runtime SDK for Qt](http://developers.arcgis.com/qt). There are QML examples in this repo that demonstrate the use of these controls and how they can be used as resuable building blocks for your QML-based ArcGIS applications.
 
@@ -26,8 +26,8 @@ This project contains QML source code for controls and utilities you can use wit
   - Add a qmake variable - `QML_IMPORT_PATH+=<path_to_repo>/Import`
   - Add the path to the QML Engine's path list in C++ code - `QQmlEngine::addImportPath("<path_to_repo>/Import");`
 4. Import the QML plugin modules in your project. For example:
-  - `import Esri.ArcGISRuntime.Toolkit.Controls 100.5`
-  - `import Esri.ArcGISRuntime.Toolkit.Dialogs 100.5`
+  - `import Esri.ArcGISRuntime.Toolkit.Controls 100.6`
+  - `import Esri.ArcGISRuntime.Toolkit.Dialogs 100.6`
 
 ## Alternate Setup instructions (importing the Toolkit as a plugin)
 
@@ -38,7 +38,7 @@ Starting with Qt 5.9.0 on iOS, the Toolkit must be imported as a plugin.
 
 For example, 
 ```qmake 
-include(/Users/james/ArcGIS_SDKs/Qt100.5/sdk/toolkit/Plugin/ArcGISRuntimeToolkitPlugin.pri)
+include(/Users/james/ArcGIS_SDKs/Qt100.6/sdk/toolkit/Plugin/ArcGISRuntimeToolkitPlugin.pri)
 ```
 
 3. The Toolkit will now be compiled into your application directly as a plugin.
@@ -47,13 +47,13 @@ include(/Users/james/ArcGIS_SDKs/Qt100.5/sdk/toolkit/Plugin/ArcGISRuntimeToolkit
 The toolkit repo has a demo project located in the Examples folder. This project is not meant to be a template to base your projects off of, but rather to be a quick and easy way to test and demonstrate the capabilities of various toolkit components. You can run the demo project by doing the following steps:
 
 1. Open `Examples.qmlproject` in Qt Creator
-2. Go to Projects > Run, and add a new variable called QML2_IMPORT_PATH, and set the value equal to the path of ArcGIS Runtime and the Toolkit. For example, `QML2_IMPORT_PATH=/Users/<username>/ArcGIS_SDKs/Qt100.5/sdk/macOS/x64/qml:/Users/<username>/ArcGIS_SDKs/Qt100.5/sdk/toolkit/Import`
-3. Depending on your system, you may additionally need to add the path to the EsriCommonQt library into an environment variable. On Windows, add it to the PATH, on Linux, add it to LD_LIBRARY_PATH, and on macOS, add it to DYLD_LIBRARY_PATH. For example, `PATH=C:\Program Files (x86)\ArcGIS SDKs\Qt100.5\sdk\windows\x64\bin`.
+2. Go to Projects > Run, and add a new variable called QML2_IMPORT_PATH, and set the value equal to the path of ArcGIS Runtime and the Toolkit. For example, `QML2_IMPORT_PATH=/Users/<username>/ArcGIS_SDKs/Qt100.6/sdk/macOS/x64/qml:/Users/<username>/ArcGIS_SDKs/Qt100.6/sdk/toolkit/Import`
+3. Depending on your system, you may additionally need to add the path to the EsriCommonQt library into an environment variable. On Windows, add it to the PATH, on Linux, add it to LD_LIBRARY_PATH, and on macOS, add it to DYLD_LIBRARY_PATH. For example, `PATH=C:\Program Files (x86)\ArcGIS SDKs\Qt100.6\sdk\windows\x64\bin`.
 4. The qmlscene application on Windows and Linux require that the path to the Qt libraries be specified in the PATH and LD_LIBRARY_PATH, respectively. For example, `PATH=C:\Qt5.9.2\msvc2015_64\bin`.
 5. Run the app and select an example from the drop down.
 
 ## Version
-The Toolkit is forwards compatible with the ArcGIS Runtime API. It is not backwards compatible. This means that version 100.4 of the Toolkit can be used with version 100.5 of the Runtime API. However, version 100.5 of the Toolkit cannot be used with version 100.4 of the Runtime API, as this version of the Toolkit may require functionality from a newer version of the Runtime API.
+The Toolkit is forwards compatible with the ArcGIS Runtime API. It is not backwards compatible. This means that version 100.3 of the Toolkit can be used with version 100.4 of the Runtime API. However, version 100.4 of the Toolkit cannot be used with version 100.3 of the Runtime API, as this version of the Toolkit may require functionality from a newer version of the Runtime API.
 
 ## Use a previous version
 The `master` branch contains toolkit components for the current, most up-to-date version of ArcGIS Runtime. To access previous versions, you can checkout by a tag or commit, or alternativley you can download the source zip: