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

Update build guide for Qt6.3.2 #405

Merged
merged 2 commits into from
Mar 4, 2024
Merged

Conversation

jw098
Copy link
Collaborator

@jw098 jw098 commented Mar 3, 2024

In particular, I removed bullet 9, which mentions editing CMakeLists.txt. I feel this was confusing since QT_MAJOR was already set to 6.

@Mysticial
Copy link
Collaborator

Let me know when this is ready since I got a lot of notifs from the last one and I can't tell if it's will WIP.

@jw098
Copy link
Collaborator Author

jw098 commented Mar 3, 2024

Sorry about that. I'm new to using git and I realized that my last pull request was working off the main branch instead of a separate branch.

I'm basically done. The only other change I would suggest is adding another screenshot for step 7, but the directory for BuildSetup is excluded from git.

Windows-desktop-Configuration

@Mysticial
Copy link
Collaborator

You should be able to override it. Probably depends on what git client you're using.

@pifopi
Copy link
Member

pifopi commented Mar 3, 2024

git add --force path/to/your/file.txt
For the command if you are using command line

@jw098
Copy link
Collaborator Author

jw098 commented Mar 4, 2024

Thanks. I didn't know overriding was possible.

I'm now done with my changes.

@Mysticial Mysticial merged commit a5c1ca2 into PokemonAutomation:main Mar 4, 2024
6 checks passed
@jw098 jw098 deleted the build-QT branch March 26, 2024 04:37
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.

3 participants