Merge pull request #589 from Esri/v.next

ldanzinger · web-flow · commit b5fcac78b5e5 · 2023-04-19T14:34:28.000-05:00
Updating main branch to 200.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 200.0
 * (UtilityNetworkTrace) Introduction of the new Utility Network Trace tool (C++/Quick).
+* Increased minimum version to use Qt 6
+* Updated language to allow for C++ 17
 
 ## 100.15
 
diff --git a/augmentedreality/CppApi/source/ArcGISArView.cpp b/augmentedreality/CppApi/source/ArcGISArView.cpp
@@ -45,7 +45,7 @@ namespace Esri::ArcGISRuntime::Toolkit {
   This toolkit component allows quick and easy integration
   of AR into your application for a variety of scenarios.
 
-  See \l {https://github.com/Esri/arcgis-runtime-toolkit-qt/blob/master/Common/AR/README.md} {additional details about using the ArcGISArView toolkit component}.
+  See \l {https://github.com/Esri/arcgis-maps-sdk-toolkit-qt/blob/master/Common/AR/README.md} {additional details about using the ArcGISArView toolkit component}.
  */
 
 /*!
diff --git a/augmentedreality/Examples/CppArExample/CppArExample.pro b/augmentedreality/Examples/CppArExample/CppArExample.pro
@@ -35,7 +35,7 @@ equals(QT_MAJOR_VERSION, 6) {
   }
 }
 
-ARCGIS_RUNTIME_VERSION = 200.0.0
+ARCGIS_RUNTIME_VERSION = 200.1.0
 include($$PWD/arcgisruntime.pri)
 
 HEADERS += \
@@ -58,7 +58,7 @@ OTHER_FILES += \
 # AR configuration
 
 # The path to the ArcGIS runtime toolkit for Qt sources, corresponding to the files downloaded
-# from the GitHub repo: https://github.com/Esri/arcgis-runtime-toolkit-qt
+# from the GitHub repo: https://github.com/Esri/arcgis-maps-sdk-toolkit-qt
 
 ARCGIS_TOOLKIT_PATH = # must be set to the root path of the toolkit folder
 
diff --git a/augmentedreality/Examples/QmlArExample/QmlArExample.pro b/augmentedreality/Examples/QmlArExample/QmlArExample.pro
@@ -37,7 +37,7 @@ equals(QT_MAJOR_VERSION, 6) {
   }
 }
 
-ARCGIS_RUNTIME_VERSION = 200.0.0
+ARCGIS_RUNTIME_VERSION = 200.1.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
@@ -64,7 +64,7 @@ OTHER_FILES += \
 # AR configuration
 
 # The path to the ArcGIS Maps SDK toolkit for Qt sources, corresponding to the files downloaded
-# from the GitHub repo: https://github.com/Esri/arcgis-runtime-toolkit-qt
+# from the GitHub repo: https://github.com/Esri/arcgis-maps-sdk-toolkit-qt
 
 ARCGIS_TOOLKIT_PATH = # must be set to the root path of the toolkit folder
 
diff --git a/augmentedreality/QmlApi/source/QmlArcGISArView.cpp b/augmentedreality/QmlApi/source/QmlArcGISArView.cpp
@@ -35,7 +35,7 @@ namespace Esri::ArcGISRuntime::Toolkit {
   The Augmented Reality (AR) toolkit component allows quick and easy integration
   of AR into your application for a variety of scenarios.
 
-  See see \l {https://github.com/Esri/arcgis-runtime-toolkit-qt/blob/master/Common/AR/README.md}{the AR README on GitHub}
+  See see \l {https://github.com/Esri/arcgis-maps-sdk-toolkit-qt/blob/master/Common/AR/README.md}{the AR README on GitHub}
   for details.
  */
 
diff --git a/augmentedreality/README.md b/augmentedreality/README.md
@@ -77,10 +77,10 @@ used to create the Qt project.
 for details.
 
 2. Download from GitHub the source files of the
-[ArcGIS Maps SDK for Qt Toolkit](https://github.com/Esri/arcgis-runtime-toolkit-qt).
+[ArcGIS Maps SDK for Qt Toolkit](https://github.com/Esri/arcgis-maps-sdk-toolkit-qt).
 
 3. In Qt Creator, create a new project and select the app template named
-"ArcGIS Maps 200.0.0 Qt Quick C++ app". Select the option "3D project" in the
+"ArcGIS Maps 200.1.0 Qt Quick C++ app". Select the option "3D project" in the
 "Details" dialog.
 
 4. In the newly created project, add the following lines anywhere in the app's project (`.pro`)
@@ -225,9 +225,9 @@ An example of QML app with AR support can be found in the folder
 [ArcGIS Maps SDK for Qt Guide](https://developers.arcgis.com/qt/latest/qml/guide/arcgis-runtime-sdk-for-qt.htm)
 for details.
 
-2. Download the sources of the [ArcGIS Maps SDK for Qt Toolkit](https://github.com/Esri/arcgis-runtime-toolkit-qt) from GitHub.
+2. Download the sources of the [ArcGIS Maps SDK for Qt Toolkit](https://github.com/Esri/arcgis-maps-sdk-toolkit-qt) from GitHub.
 
-3. In Qt Creator, create a new project and select "ArcGIS Maps 200.0.0 Qt Quick QML app".
+3. In Qt Creator, create a new project and select "ArcGIS Maps 200.1.0 Qt Quick QML app".
 Select the option "3D project" in the "Details" step.
 
 4. In the created project, add the following lines anywhere in the app's project
diff --git a/calcite-qml/README.md b/calcite-qml/README.md
@@ -18,7 +18,7 @@ To integrate Calcite into your app, add the following lines to your `*.pro` file
 
 ```pro
 QT += quickcontrols2
-RESOURCES += path/to/arcgis-runtime-toolkit-qt/calcite-qml/Calcite/calcite.qrc
+RESOURCES += path/to/arcgis-maps-sdk-toolkit-qt/calcite-qml/Calcite/calcite.qrc
 ```
 
 And then in `main.cpp` add the following lines:
diff --git a/calcite-qml/demo/calcite_test.pro b/calcite-qml/demo/calcite_test.pro
@@ -23,7 +23,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick quickcontrols2
 
-ARCGIS_RUNTIME_VERSION = 200.0.0
+ARCGIS_RUNTIME_VERSION = 200.1.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app
diff --git a/tests/uitools/cpp_quick/unit_tests/BasemapGalleryItemUnitTest/BasemapGalleryItemUnitTest.pro b/tests/uitools/cpp_quick/unit_tests/BasemapGalleryItemUnitTest/BasemapGalleryItemUnitTest.pro
@@ -27,7 +27,7 @@ QT += testlib
 QT -= gui
 QT += core gui opengl xml testlib network positioning sensors multimedia quick
 
-ARCGIS_RUNTIME_VERSION = 200.0.0
+ARCGIS_RUNTIME_VERSION = 200.1.0
 
 include($$PWD/../arcgisruntime.pri)
 include($$PWD/../../../../../uitools/toolkitcpp.pri)
diff --git a/tests/uitools/qml_quick/functional_tests/FloorFilterControllerFuncTest/FloorFilterControllerFuncTest.pro b/tests/uitools/qml_quick/functional_tests/FloorFilterControllerFuncTest/FloorFilterControllerFuncTest.pro
@@ -16,7 +16,7 @@ CONFIG += c++17 warn_on qmltestcase
 
 TEMPLATE = app
 
-ARCGIS_RUNTIME_VERSION = 200.0.0
+ARCGIS_RUNTIME_VERSION = 200.1.0
 include($$PWD/../../shared/arcgisruntime.pri)
 include($$PWD/../../../../../uitools/toolkitqml.pri)
 
diff --git a/tests/uitools/qml_quick/functional_tests/FloorFilterFuncTest/FloorFilterFuncTest.pro b/tests/uitools/qml_quick/functional_tests/FloorFilterFuncTest/FloorFilterFuncTest.pro
@@ -16,7 +16,7 @@ CONFIG += c++17 warn_on qmltestcase
 
 TEMPLATE = app
 
-ARCGIS_RUNTIME_VERSION = 200.0.0
+ARCGIS_RUNTIME_VERSION = 200.1.0
 include($$PWD/../../shared/arcgisruntime.pri)
 include($$PWD/../../../../../uitools/toolkitqml.pri)
 
diff --git a/tests/uitools/qml_quick/unit_tests/FloorFilterControllerUnitTest/FloorFilterControllerUnitTest.pro b/tests/uitools/qml_quick/unit_tests/FloorFilterControllerUnitTest/FloorFilterControllerUnitTest.pro
@@ -16,7 +16,7 @@ CONFIG += c++17 warn_on qmltestcase
 
 TEMPLATE = app
 
-ARCGIS_RUNTIME_VERSION = 200.0.0
+ARCGIS_RUNTIME_VERSION = 200.1.0
 include($$PWD/../../shared/arcgisruntime.pri)
 include($$PWD/../../../../../uitools/toolkitqml.pri)
 
diff --git a/uitools/README.md b/uitools/README.md
@@ -47,7 +47,7 @@ project.
 A good way to start using the toolkit is to use one of the template apps which
 get added to QtCreator when you install the ArcGIS Runime SDK for Qt.
 
-- In QtCreator choose `File/New file or project/ArcGIS/ArcGIS Maps 200.0.0 Quick QML App`
+- In QtCreator choose `File/New file or project/ArcGIS/ArcGIS Maps 200.1.0 Quick QML App`
 - choose settings to match the platform etc. you are building for
 - in the `.pro` file of your new app, add a line to add the toolkit for your
   QML application. For example:
@@ -111,7 +111,7 @@ MapView {
 A good way to start using the toolkit is to use one of the template apps which
 get added to QtCreator when you install the ArcGIS Runime SDK for Qt.
 
-- In QtCreator choose `File/New file or project/ArcGIS/ArcGIS Maps 200.0.0 Qt Quick C++ App`
+- In QtCreator choose `File/New file or project/ArcGIS/ArcGIS Maps 200.1.0 Qt Quick C++ App`
 - choose settings to match the platform etc. you are building for
 - in the `.pro` file of your new app, add a line to add the library for your QML
   plugin - for example:
@@ -172,7 +172,7 @@ MapView {
 A good way to start using the toolkit is to use one of the template apps which
 get added to QtCreator when you install the ArcGIS Maps SDK for Qt.
 
-- In QtCreator choose `File/New file or project/ArcGIS/ArcGIS Maps 200.0.0 Qt Widgets App`
+- In QtCreator choose `File/New file or project/ArcGIS/ArcGIS Maps 200.1.0 Qt Widgets App`
 - choose settings to match the platform etc. you are building for
 - in the `.pro` file of your new app, add a line to add the library for your QML
   plugin - for example:
diff --git a/uitools/examples/cpp_quick/cpp_quick.pro b/uitools/examples/cpp_quick/cpp_quick.pro
@@ -39,7 +39,7 @@ equals(QT_MAJOR_VERSION, 6) {
   }
 }
 
-ARCGIS_RUNTIME_VERSION = 200.0.0
+ARCGIS_RUNTIME_VERSION = 200.1.0
 include($$PWD/arcgisruntime.pri)
 include($$PWD/../../toolkitcpp.pri)
 
diff --git a/uitools/examples/qml_quick/qml_quick.pro b/uitools/examples/qml_quick/qml_quick.pro
@@ -24,7 +24,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick
 
-ARCGIS_RUNTIME_VERSION = 200.0.0
+ARCGIS_RUNTIME_VERSION = 200.1.0
 include($$PWD/arcgisruntime.pri)
 include($$PWD/../../toolkitqml.pri)
 
diff --git a/uitools/import/Esri/ArcGISRuntime/Toolkit/AuthenticationView.qml b/uitools/import/Esri/ArcGISRuntime/Toolkit/AuthenticationView.qml
@@ -71,9 +71,13 @@ Item {
             const component = internal.viewNameForChallengeType(controller.currentChallengeType);
             if (component) {
                 const incubator = component.incubateObject(authenticationView);
-                incubator.onStatusChanged = function(status) {
-                    if (status === Component.Ready) {
-                        this.object.open();
+                if (incubator.status === Component.Ready) {
+                    incubator.object.open();
+                } else {
+                    incubator.onStatusChanged = function(status) {
+                        if (status === Component.Ready) {
+                            this.object.open();
+                        }
                     }
                 }
             }
@@ -94,6 +98,7 @@ Item {
             onClosed: {
                 this.destroy();
             }
+            Component.onCompleted: activeLoginViewReady_(this)
         }
     }
 
@@ -111,6 +116,7 @@ Item {
             onClosed: {
                 this.destroy();
             }
+            onWebViewLoaded_: activeLoginViewReady_(this)
         }
     }
 
@@ -148,6 +154,12 @@ Item {
         }
     }
 
+    /*!
+        \internal
+        \brief signal emitted when the login view is in the Ready state
+    */
+    signal activeLoginViewReady_(var activeLoginView)
+
     QtObject {
         id: internal
         function viewNameForChallengeType(type) {
diff --git a/uitools/import/Esri/ArcGISRuntime/Toolkit/Controller/qmldir b/uitools/import/Esri/ArcGISRuntime/Toolkit/Controller/qmldir
@@ -15,7 +15,7 @@
 module Esri.ArcGISRuntime.Toolkit.Controller
 
 # Current version increment
-CurrentVersion 200.0 CurrentVersion.qml
+CurrentVersion 200.1 CurrentVersion.qml
 
 # Controller components
 AuthenticationController 100.10 AuthenticationController.qml
diff --git a/uitools/import/Esri/ArcGISRuntime/Toolkit/OAuth2View.qml b/uitools/import/Esri/ArcGISRuntime/Toolkit/OAuth2View.qml
@@ -55,6 +55,7 @@ Dialog {
         onLoadingChanged: (loadRequest) => {
             if (loadRequest.status === WebView.LoadSucceededStatus) {
                 forceActiveFocus();
+                webViewLoaded_();
             } else if (loadRequest.status === WebView.LoadFailedStatus) {
                 controller.cancelWithError("Failed to load");
             }
@@ -102,4 +103,34 @@ Dialog {
             webview.runJavaScript(js, function(result) { html = result; });
         }
     }
+
+    /*!
+        \internal
+        \brief signal emitted when the login web view is loaded
+    */
+    signal webViewLoaded_
+
+    /*!
+      \internal
+      \brief pre-fill the username and password fields
+     */
+    function prefillUsernameAndPassword(username, password) {
+        const js = `setTimeout(function() { document.getElementById('user_username').value = '${username}'; document.getElementById('user_password').value = '${password}'; }, 1000);`;
+        webView.runJavaScript(js);
+    }
+
+    /*!
+      \internal
+      \brief Fill and accept the username and password
+     */
+    function applyUsernameAndPassword(username, password) {
+        const js = `
+        setTimeout(function() {
+            document.getElementById('user_username').value = '${username}';
+            document.getElementById('user_password').value = '${password}';
+            document.getElementById('oauth').submit();
+        }, 1000);
+        `;
+        webView.runJavaScript(js);
+    }
 }
diff --git a/uitools/import/Esri/ArcGISRuntime/Toolkit/UserCredentialsView.qml b/uitools/import/Esri/ArcGISRuntime/Toolkit/UserCredentialsView.qml
@@ -109,6 +109,25 @@ Dialog {
         return usernameTextField.text !== "" && passwordTextField.text !== "";
     }
 
+    /*!
+      \internal
+      \brief pre-fill the username and password fields
+     */
+    function prefillUsernameAndPassword(username, password) {
+        usernameTextField.text = username;
+        passwordTextField.text = password;
+    }
+
+    /*!
+      \internal
+      \brief Fill and accept the username and password
+     */
+    function applyUsernameAndPassword(username, password) {
+        prefillUsernameAndPassword(username, password);
+        acceptWithCurrentUsernameAndPassword();
+        accept();
+    }
+
     /*!
      \internal
      \brief Attempts to apply the current username and password to
diff --git a/uitools/import/Esri/ArcGISRuntime/Toolkit/qmldir b/uitools/import/Esri/ArcGISRuntime/Toolkit/qmldir
@@ -14,10 +14,10 @@
 
 module Esri.ArcGISRuntime.Toolkit
 
-depends Esri.ArcGISRuntime.Toolkit.Controller 200.0
+depends Esri.ArcGISRuntime.Toolkit.Controller 200.1
 
 # Current version increment
-CurrentVersion 200.0 CurrentVersion.qml
+CurrentVersion 200.1 CurrentVersion.qml
 
 # View components
 AuthenticationView 100.10 AuthenticationView.qml
diff --git a/uitools/register/Esri/ArcGISRuntime/Toolkit/internal/register_cpp.cpp b/uitools/register/Esri/ArcGISRuntime/Toolkit/internal/register_cpp.cpp
@@ -67,7 +67,7 @@ namespace Esri::ArcGISRuntime::Toolkit {
     constexpr char const* NAMESPACE = "Esri.ArcGISRuntime.Toolkit.Controller";
 
     constexpr int VERSION_MAJOR = 200;
-    constexpr int VERSION_MINOR = 0;
+    constexpr int VERSION_MINOR = 1;
 
     /*
       \internal
diff --git a/uitools/toolkit.qdocconf b/uitools/toolkit.qdocconf
@@ -16,7 +16,7 @@ project = EsriArcGISRuntimeToolkit
 
 description = Esri ArcGISRuntime Toolkit Documentation
 
-version = 200.0
+version = 200.1
 
 headers.fileextensions  = "*.h"
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ equals(QT_MAJOR_VERSION, 6) {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`-ARCGIS_RUNTIME_VERSION = 200.0.0`
	`38`	`+ARCGIS_RUNTIME_VERSION = 200.1.0`
`39`	`39`	`include($$PWD/arcgisruntime.pri)`
`40`	`40`
`41`	`41`	`HEADERS += \`
`@@ -58,7 +58,7 @@ OTHER_FILES += \`
`58`	`58`	`# AR configuration`
`59`	`59`
`60`	`60`	`# The path to the ArcGIS runtime toolkit for Qt sources, corresponding to the files downloaded`
`61`		`-# from the GitHub repo: https://github.com/Esri/arcgis-runtime-toolkit-qt`
	`61`	`+# from the GitHub repo: https://github.com/Esri/arcgis-maps-sdk-toolkit-qt`
`62`	`62`
`63`	`63`	`ARCGIS_TOOLKIT_PATH = # must be set to the root path of the toolkit folder`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ equals(QT_MAJOR_VERSION, 6) {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-ARCGIS_RUNTIME_VERSION = 200.0.0`
	`40`	`+ARCGIS_RUNTIME_VERSION = 200.1.0`
`41`	`41`	`include($$PWD/arcgisruntime.pri)`
`42`	`42`
`43`	`43`	`TEMPLATE = app`
`@@ -64,7 +64,7 @@ OTHER_FILES += \`
`64`	`64`	`# AR configuration`
`65`	`65`
`66`	`66`	`# The path to the ArcGIS Maps SDK toolkit for Qt sources, corresponding to the files downloaded`
`67`		`-# from the GitHub repo: https://github.com/Esri/arcgis-runtime-toolkit-qt`
	`67`	`+# from the GitHub repo: https://github.com/Esri/arcgis-maps-sdk-toolkit-qt`
`68`	`68`
`69`	`69`	`ARCGIS_TOOLKIT_PATH = # must be set to the root path of the toolkit folder`
`70`	`70`