Skip to content
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

Merged
merged 13 commits into from
May 24, 2024
Merged

Jared/lets try to merge #1710

merged 13 commits into from
May 24, 2024

Conversation

jared-2016
Copy link
Collaborator

@jared-2016 jared-2016 commented May 23, 2024

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

  • Bug fix
  • New sample implementation
  • Sample viewer enhancement
  • Other enhancement

Platforms tested on:

  • Windows
  • Android -IP
  • Linux - IP
  • macOS
  • iOS - IP

Checklist

  • Runs and compiles on all active platforms as a standalone sample
  • Runs and compiles in the sample viewer(s)
  • Branch is up to date with the latest main/v.next
  • All merge conflicts have been resolved
  • Self-review of changes
  • There are no warnings related to changes
  • No unrelated changes have been made to any other code or project files
  • Code is commented with correct formatting (CTRL+i)
  • All variable and method names are camel case
  • There is no leftover commented code
  • Screenshots are correct size and display in description tab (500px by 500px, platform agnostic)
  • If adding a new sample, it is added to the sample viewer
  • Cherry-picked to Main branch (if applicable)

.gitignore Show resolved Hide resolved
@@ -87,43 +87,43 @@ INCLUDEPATH += \
$$COMMONVIEWER/SyntaxHighlighter

HEADERS += \
Copy link
Collaborator Author

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.

@jared-2016
Copy link
Collaborator Author

I think I got the old reference to zlib/minizip and the folders themselves removed.

@jared-2016
Copy link
Collaborator Author

All the commented out code for the QML Samples App has been removed. The duplicate ZipHelper class has been removed.

@jared-2016
Copy link
Collaborator Author

Round 2 here we go. I was able to test on iOS and Android

@jared-2016 jared-2016 merged commit 55ab217 into v.next May 24, 2024
1 check passed
@jared-2016 jared-2016 deleted the jared/LetsTryToMerge branch May 24, 2024 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants