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

Event changes for hotkey editor #2362

Merged
merged 3 commits into from Jun 2, 2017
Merged

Event changes for hotkey editor #2362

merged 3 commits into from Jun 2, 2017

Conversation

skurfer
Copy link
Member

@skurfer skurfer commented May 31, 2017

I removed the problematic entries, and switched the others to use the newer names. It means we can’t build with Xcode 7 any more, but that ship already sailed with NSWindowStyleMask. I’ll add another commit to update Travis.

Take a quick look at this if you can @tiennou.

skurfer added 3 commits May 31, 2017
These get triggered too often and prevent setting shortcuts for activation and triggers

fixes #2361
and remove school, since it fails with Xcode 8+
ruby Quicksilver/Tools/travis/check_indent.rb &&
xctool -project "$TRAVIS_XCODE_PROJECT" -scheme "$TRAVIS_XCODE_SCHEME" build test

ruby Quicksilver/Tools/travis/check_indent.rb
Copy link
Member

@tiennou tiennou Jun 1, 2017

Choose a reason for hiding this comment

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

Haven't you killed the xctool invocation here ?

Copy link
Member Author

@skurfer skurfer Jun 1, 2017

Choose a reason for hiding this comment

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

Yes. It fails under Xcode 8 and they aren’t planning to fix it.

@tiennou
Copy link
Member

tiennou commented Jun 1, 2017

LGTM !

@skurfer skurfer merged commit 5ccbecd into master Jun 2, 2017
@skurfer skurfer deleted the eventenum branch Jun 2, 2017
skurfer added a commit that referenced this pull request Jun 2, 2017
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