-
Notifications
You must be signed in to change notification settings - Fork 23
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
Conversation
d36e9b1
to
cefa3ad
Compare
Ok This finally works. I think we can merge this because it is also used for master builds. |
51f8785
to
bae901e
Compare
Conflicts: scripts/macosx/build_environment.sh
Merge? |
scripts/macosx/build_qtkeychain.sh
Outdated
popd > /dev/null | ||
|
||
export VERSION_NUMBER=0.9.1 | ||
export QT_VERSION=5.10.1 |
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.
this is now 5.11.1
Conflicts: scripts/linux-ubuntu/pbuilderrc
Can one have a look? |
test this please |
@Pegasus-RPG cleared up disk space a few days ago, so I think it should build now. |
scripts/macosx/build_environment.sh
Outdated
@@ -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' |
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.
Please rebase this to use Qt 5.11.1
3cf53e4
to
1f32e35
Compare
Ready:-) |
thanks! |
This is the successor of #49 updated to qtkeychain 0.9.1
Fixes #40.