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

Add qtkeychain 0.9.1 support to Linux/macOS build. #54

Merged
merged 11 commits into from
Sep 18, 2018

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented Aug 23, 2018

This is the successor of #49 updated to qtkeychain 0.9.1

Fixes #40.

@daschuer
Copy link
Member Author

Ok This finally works. I think we can merge this because it is also used for master builds.

@rryan rryan changed the title Qtkeychain unix Add qtkeychain 0.9.1 support to Linux/macOS build. Aug 28, 2018
@Be-ing Be-ing added this to the 2.3.0 milestone Aug 31, 2018
@daschuer
Copy link
Member Author

daschuer commented Sep 2, 2018

Merge?

popd > /dev/null

export VERSION_NUMBER=0.9.1
export QT_VERSION=5.10.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is now 5.11.1

@daschuer
Copy link
Member Author

No space left on device

Can one have a look?

@Be-ing
Copy link
Contributor

Be-ing commented Sep 17, 2018

test this please

@Be-ing
Copy link
Contributor

Be-ing commented Sep 17, 2018

@Pegasus-RPG cleared up disk space a few days ago, so I think it should build now.

@@ -16,6 +16,7 @@ MIXXX_MACOSX_SDK=$(xcodebuild -version -sdk macosx SDKVersion)
# Qt 5.11 requires a minimum of macOS 10.11.
MIXXX_MACOSX_TARGET='10.11'
MIXXX_MACOSX_STDLIB='libc++'
MIXXX_QT_VERSION='5.10.1'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rebase this to use Qt 5.11.1

@daschuer
Copy link
Member Author

Ready:-)

@rryan
Copy link
Member

rryan commented Sep 18, 2018

thanks!

@rryan rryan merged commit 3a5df85 into mixxxdj:2.2.x-unix Sep 18, 2018
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

3 participants