-
Notifications
You must be signed in to change notification settings - Fork 193
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Jared/lets try to merge #1710
Jared/lets try to merge #1710
Conversation
… but it does what it needs to do.
# Conflicts: # .gitignore
ArcGISRuntimeSDKQt_SampleViewers/ArcGISRuntimeSDKQt_CppSamples/zlib-ng/slide_hash.c
Outdated
Show resolved
Hide resolved
@@ -87,43 +87,43 @@ INCLUDEPATH += \ | |||
$$COMMONVIEWER/SyntaxHighlighter | |||
|
|||
HEADERS += \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because both the C++ and QML sampleviewer share a handful of source items that needed to be updated to accommodate the changes to bring zlib into the sampleviewer, i opted to just comment out the files that had shared classes and gave the qml sampleviewer a new mainSample.cpp that will build. It obviously doesn't work like it should but this is going away anyways and it avoids more scope creep in other areas.
...ISRuntimeSDKQt_SampleViewers/ArcGISRuntimeSDKQt_CppSamples/ArcGISRuntimeSDKQt_CppSamples.pro
Show resolved
Hide resolved
I think I got the old reference to zlib/minizip and the folders themselves removed. |
ArcGISRuntimeSDKQt_SampleViewers/ArcGISRuntimeSDKQt_CppSamples/ZipHelper.h
Outdated
Show resolved
Hide resolved
ArcGISRuntimeSDKQt_SampleViewers/ArcGISRuntimeSDKQt_QMLSamples/mainSample.cpp
Outdated
Show resolved
Hide resolved
ArcGISRuntimeSDKQt_SampleViewers/ArcGISRuntimeSDKQt_QMLSamples/mainSample.cpp
Outdated
Show resolved
Hide resolved
ArcGISRuntimeSDKQt_SampleViewers/ArcGISRuntimeSDKQt_QMLSamples/mainSample.cpp
Outdated
Show resolved
Hide resolved
ArcGISRuntimeSDKQt_SampleViewers/ArcGISRuntimeSDKQt_QMLSamples/mainSample.cpp
Outdated
Show resolved
Hide resolved
All the commented out code for the QML Samples App has been removed. The duplicate ZipHelper class has been removed. |
Round 2 here we go. I was able to test on iOS and Android |
Description
Remove extras dependency and add it to the sample viewer, again.
Also made some changes to the QML Samples App so that it builds successfully.
Type of change
Platforms tested on:
Checklist