Skip to content

Commit 39bf24d

Browse files
bri12415ldanzingerjared-2016aji13187JamesMBallard
authored
Bri12415/v.next merged with main (#652)
* Updating main branch to 200.5 (#636) * 200.4.0 -> 200.5.0 version upgrade. * cmake file for the toolkit * toolkit cmake file * include_directories is enough for header files * move some stuff around, account for IOS * modify QML_IMPORT_PATH so qml knows where the module is * Add contributors Add two new contributors to the toolkit readme * Put common needed files in common.cmake, make widgets cmake file, adjust toolkitcpp.cmake * Make the names consistent * update README.md * Add headers to display in IDE. * PR Frank Miller * remove common.cmake, no longer needed. * Do not use file(GLOB... * new line at end of file * match ordering elsewhere * Use functions to assign variables, follow naming pattern for variables * remove common.cmake * Just explicitly list the required files * update README with new instructs * Update docs on location of setup_toolkit call * typo * setup_toolkit -> setup_toolkitwidgets * MyTarget -> target_name to match toolkitcpp.cmake doc * setup_toolkit -> setup_toolkitwidgets * append to QML_IMPORT_PATH * update readme to match template app * nitpick variable/argument highlighting in markdown * James PR * James PR * James PR * Bri12415/toolkit libary cmake (#619) * stash commit, test turning toolkit into library * CMakeLists.txt for the toolkit * copyright * remove comment * QML_IMPORT_PATH * Change project directory structure, toolkitcpp and toolkitwidgets, so each can have CMakeLists.txt * James partial PR: move doc images to og location * Update README.md with new cmake workflows * Move toolkitcpp.pri and toolkitwidgets.pri to original location. Adjust internals for new directory changes. * Toolkit - Update builds and minimum requirements to Qt 6.5.6 (#620) * Update doc (#621) * Reverted xcode, Qt 6.5.6 changes in tookit (#622) * Toolkit - Update builds and minimum requirements to Qt 6.5.6 (#623) * Jared/remove qml (#625) * remove QML examples/tests * remove controllers and qml api * some qml doc fixes, very preliminary * point to cpp references now. * no QML controller anymore. * qml removed, no longer applicable. This is the way... * bye qml * doc updates * remove more qml doc. * Use newer gradle. (#626) * Luca6804/citrav2 doc (#624) * changing text from api key to access token * Update README.md * Update main.cpp * Apply suggestions from code review Co-authored-by: Mary Harvey <mharvey@esri.com> * Apply suggestions from code review Rd 2 Co-authored-by: Don Kemlage <dkemlage@esri.com> --------- Co-authored-by: Mary Harvey <mharvey@esri.com> Co-authored-by: Don Kemlage <dkemlage@esri.com> * Jared/calcite fix (#628) * change map/basemap from qml to c++ * fixing .pri * new c++ class * not needed. * alphabetical * Update calcite-qml/demo/main.cpp Co-authored-by: James Ballard <JamesMBallard@users.noreply.github.com> * review comment. --------- Co-authored-by: James Ballard <JamesMBallard@users.noreply.github.com> * change qAsConst to std::as_const (#629) * Guil8553/5362 remove qml (#627) * remove/rename qml * commit 2 * commit 3 * commit 5 * commit 6 * commit 7 * commit 8 * cmmit 8 * commit 9 * commit 10 * commit 11 * commit 12 * commit 13 * remove comment * fix path to toolkit * remove calcite * cancel change * remove change * cancel calcite changes * remove calcite changes * clean up * rename calcite-qml to calcite * remove unused * fix doc (#630) * fix build (#631) * fix build (#632) * Modify CFBundleDisplayName and CFBundleExecutable Info.plist keys to fix iOS deployment (#633) * fix projects using $$files (#634) * Aji13187/map pin not loaded (#635) * Toolkit Search view pin image not displayed fix * toolkitwidgets files updated * toolkitwidget image added. * review comment fixed * Update CHANGELOG.md --------- Co-authored-by: Jared Caccamo <jcaccamo@esri.com> Co-authored-by: Jared Caccamo <11935261+jared-2016@users.noreply.github.com> Co-authored-by: Brian Noble <bnoble@esri.com> Co-authored-by: Brian Noble <bri12415@esri.com> Co-authored-by: Ajith Challiyil Pulakkatuthodi <123126365+aji13187@users.noreply.github.com> Co-authored-by: James Ballard <JamesMBallard@users.noreply.github.com> Co-authored-by: Mary Harvey <mharvey@esri.com> Co-authored-by: Don Kemlage <dkemlage@esri.com> Co-authored-by: Guillaume Belz <1651508+GuillaumeBelz@users.noreply.github.com> Co-authored-by: Guillaume Belz <GBelz@esri.com> * Rewording the readme to no longer mention the removed qml_quick app. (#642) (#643) * Rewording the readme to no longer mention the removed qml_quick app. * Update uitools/examples/README.md Co-authored-by: Brian Noble <bri12415@esri.com> --------- Co-authored-by: Brian Noble <bri12415@esri.com> (cherry picked from commit 0885b9d) --------- Co-authored-by: Lucas Danzinger <ldanzinger@esri.com> Co-authored-by: Jared Caccamo <jcaccamo@esri.com> Co-authored-by: Jared Caccamo <11935261+jared-2016@users.noreply.github.com> Co-authored-by: Ajith Challiyil Pulakkatuthodi <123126365+aji13187@users.noreply.github.com> Co-authored-by: James Ballard <JamesMBallard@users.noreply.github.com> Co-authored-by: Mary Harvey <mharvey@esri.com> Co-authored-by: Don Kemlage <dkemlage@esri.com> Co-authored-by: Guillaume Belz <1651508+GuillaumeBelz@users.noreply.github.com> Co-authored-by: Guillaume Belz <GBelz@esri.com>
1 parent a5ab6de commit 39bf24d

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)