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

Fix macOS build #1405

Merged
merged 2 commits into from Dec 7, 2016
Merged

Fix macOS build #1405

merged 2 commits into from Dec 7, 2016

Conversation

jakepetroules
Copy link
Contributor

This raises the minimumQbsVersion to 1.5.2. In Qbs 1.5.2, osx was
renamed to macos. This is a forward compatible change, as Qbs guarantees
that macos is in the targetOS list if osx is.

This raises the minimumQbsVersion to 1.5.2. In Qbs 1.5.2, osx was
renamed to macos. This is a forward compatible change, as Qbs guarantees
that macos is in the targetOS list if osx is.
@bjorn
Copy link
Member

bjorn commented Dec 7, 2016

Hmm, I need to ask AppVeyor to update their version of Qbs first. :-)

I think we can actually drop this -Wno-unknown-pragmas flag now. I added it as a workaround for some huge amount of warnings, which I expect would be fixed by now.

Many thanks in any case, for working towards fixing the Qbs build on macOS!

@jakepetroules
Copy link
Contributor Author

Note that you can actually install Qbs from Chocolatey now, and we (read: me) maintain it ourselves so it's always up to date. Then you don't have to rely on whatever version is in AppVeyor's Qt Creator install. ;)

@bjorn
Copy link
Member

bjorn commented Dec 7, 2016

Awesome, thanks!

@bjorn bjorn merged commit d9314e3 into mapeditor:master Dec 7, 2016
@jakepetroules jakepetroules deleted the fix-macos-build branch December 7, 2016 12:22
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