Merge pull request #280 from Esri/ryankim923/update_100.3

Update DSA to build with ArcGIS Runtime Version 100.3
Esri · Aug 9, 2018 · 576e023 · 576e023
2 parents 13246ae + cf9adc2
commit 576e023
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 20 deletions.
diff --git a/Handheld/AppInfo.h b/Handheld/AppInfo.h
@@ -22,7 +22,7 @@
 #define kOrganizationDomain             "myorganization.com"
 
 #define kApplicationName                "DSA_Handheld_Qt"
-#define kApplicationVersion             "1.0"
+#define kApplicationVersion             "1.1"
 #define kApplicationDescription         "Dynamic Situational Awareness - Handheld app"
 
 #define kApplicationSourceUrl           "qrc:/qml/main.qml"

diff --git a/Handheld/Handheld.pro b/Handheld/Handheld.pro
@@ -20,7 +20,7 @@ TEMPLATE = app
 QT += core gui opengl network positioning sensors qml quick xml
 CONFIG += c++11
 
-ARCGIS_RUNTIME_VERSION = 100.2.1
+ARCGIS_RUNTIME_VERSION = 100.3
 include($$PWD/../Shared/build/arcgisruntime.pri)
 include($$PWD/../Shared/build/arcgisruntimecpptoolkit.pri)
 

diff --git a/Handheld/qml/main.qml b/Handheld/qml/main.qml
@@ -22,8 +22,8 @@ import QtQml.Models 2.2
 import QtGraphicalEffects 1.0
 import Esri.DSA 1.0
 import Esri.Handheld 1.0
-import Esri.ArcGISRuntime.Toolkit.Controls 100.2
-import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.2
+import Esri.ArcGISRuntime.Toolkit.Controls 100.3
+import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.3
 
 Handheld {
     id: appRoot

diff --git a/README.md b/README.md
@@ -20,11 +20,12 @@ If you just want to grab the latest code and build the project, these are the qu
  * `cd dynamic-situational-awareness-qt`
  * `git clone https://github.com/Esri/arcgis-runtime-toolkit-qt.git`
  * `cd arcgis-runtime-toolkit-qt`
- * `git checkout release/100.2.1`
  * Open `DSA.pro` with Qt Creator, configure the projects and build.
 
+**Note:** There is a file path length limit when deploying the DSA apps to Android from Windows. The simplest way to workaround this is to shorten the folder name of the "Shadow Build Directory" in the Qt Creator Project settings.
+
 # Prerequisites
-* ArcGIS Runtime SDK for Qt 100.2.1 - NOTE currently, the DSA app MUST be built against version 100.2.1
+* ArcGIS Runtime SDK for Qt 100.3
 * Qt SDK 5.9.2 or higher
 * Qt Creator
 * ArcGIS Runtime SDK for Qt C++ Plugin [(details)](https://github.com/Esri/arcgis-runtime-toolkit-qt)
@@ -38,9 +39,7 @@ If you just want to grab the latest code and build the project, these are the qu
 ```
 # from the base of the repo
 git clone https://github.com/Esri/arcgis-runtime-toolkit-qt
-git checkout release/100.2.1
 ```
-(the release/100.2.1 branch is a snapshot which contains the latest version of the toolkit built against the 100.2.1 version of the ArcGIS Runtime SDK)
 
 ## Data
 The DSA app works with offline data. Demo data is available for Monterey, California [here](http://www.arcgis.com/home/item.html?id=82ce2d85e21c4326bc072d441b636e5e). Details for where to place the data are provided in the demo data's description. Alternatively, you can define your own data by modifying the app's configuration file.

diff --git a/Shared/qml/About.qml b/Shared/qml/About.qml
@@ -82,7 +82,7 @@ Item {
 
             Text {
                 anchors.horizontalCenter: parent.horizontalCenter
-                text: "Version: 1.0.0"
+                text: "Version: %1".arg(Qt.application.version)
                 color: Material.foreground
                 font {
                     pixelSize: 12 * scaleFactor
@@ -105,7 +105,7 @@ Item {
 
             Text {
                 anchors.horizontalCenter: parent.horizontalCenter
-                text: "Built with ArcGIS Runtime SDK 100.2.1 for Qt"
+                text: "Built with ArcGIS Runtime SDK 100.3 for Qt"
                 color: Material.foreground
                 font {
                     pixelSize: 12 * scaleFactor

diff --git a/Shared/qml/AlertToolRow.qml b/Shared/qml/AlertToolRow.qml
@@ -19,7 +19,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Controls.Material 2.2
 import QtQuick.Window 2.2
 import Esri.DSA 1.0
-import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.2
+import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.3
 
 Row {
     id: alertToolRow

diff --git a/Shared/qml/HomeToolRow.qml b/Shared/qml/HomeToolRow.qml
@@ -19,7 +19,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Controls.Material 2.2
 import QtQuick.Window 2.2
 import Esri.DSA 1.0
-import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.2
+import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.3
 
 Row {
     id: reportToolRow

diff --git a/Shared/qml/Imports.qml b/Shared/qml/Imports.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Controls.Material 2.2
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.0
-import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.2
+import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.3
 import Esri.DSA 1.0
 
 Item {

diff --git a/Shared/qml/MapToolRow.qml b/Shared/qml/MapToolRow.qml
@@ -19,7 +19,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Controls.Material 2.2
 import QtQuick.Window 2.2
 import Esri.DSA 1.0
-import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.2
+import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.3
 
 Row {
     id: mapToolRow

diff --git a/Shared/qml/MarkupToolRow.qml b/Shared/qml/MarkupToolRow.qml
@@ -19,7 +19,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Controls.Material 2.2
 import QtQuick.Window 2.2
 import Esri.DSA 1.0
-import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.2
+import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.3
 
 Row {
     id: markupToolRow

diff --git a/Shared/qml/ReportToolRow.qml b/Shared/qml/ReportToolRow.qml
@@ -19,7 +19,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Controls.Material 2.2
 import QtQuick.Window 2.2
 import Esri.DSA 1.0
-import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.2
+import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.3
 
 Row {
     id: reportToolRow

diff --git a/Vehicle/AppInfo.h b/Vehicle/AppInfo.h
@@ -22,7 +22,7 @@
 #define kOrganizationDomain             "esri.com"
 
 #define kApplicationName                "DSA_Vehicle_Qt"
-#define kApplicationVersion             "1.0"
+#define kApplicationVersion             "1.1"
 #define kApplicationDescription         "Dynamic Situational Awareness - Vehicle app"
 
 #define kApplicationSourceUrl           "qrc:/qml/main.qml"

diff --git a/Vehicle/Vehicle.pro b/Vehicle/Vehicle.pro
@@ -20,7 +20,7 @@ TEMPLATE = app
 QT += core gui opengl network positioning sensors qml quick xml
 CONFIG += c++11
 
-ARCGIS_RUNTIME_VERSION = 100.2.1
+ARCGIS_RUNTIME_VERSION = 100.3
 include($$PWD/../Shared/build/arcgisruntime.pri)
 include($$PWD/../Shared/build/arcgisruntimecpptoolkit.pri)
 

diff --git a/Vehicle/qml/main.qml b/Vehicle/qml/main.qml
@@ -21,8 +21,8 @@ import QtQuick.Window 2.2
 import QtQml.Models 2.2
 import Esri.DSA 1.0
 import Esri.Vehicle 1.0
-import Esri.ArcGISRuntime.Toolkit.Controls 100.2
-import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.2
+import Esri.ArcGISRuntime.Toolkit.Controls 100.3
+import Esri.ArcGISRuntime.Toolkit.Controls.CppApi 100.3
 
 Vehicle {
     id: appRoot