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 controllerdebug.h to unqouted output for mixxx.log #1853

Merged
merged 1 commit into from Oct 22, 2018

Conversation

banad60
Copy link
Contributor

@banad60 banad60 commented Oct 20, 2018

Since qt5, QDebug sems quoted by default. But for debugging we need unquoted output in mixxx.log

@banad60 banad60 changed the title Update controllerdebug.h Update controllerdebug.h to unqouted output for mixxx.log, because in qt5 QDebug is quoted by default. Oct 20, 2018
@banad60 banad60 changed the title Update controllerdebug.h to unqouted output for mixxx.log, because in qt5 QDebug is quoted by default. Update controllerdebug.h to unqouted output for mixxx.log Oct 20, 2018
@rryan
Copy link
Member

rryan commented Oct 20, 2018

Thank you! Could you please sign the Mixxx contributor agreement? This gives us permissions to distribute your change.

@@ -33,7 +33,7 @@ class ControllerDebug {
#define controllerDebug(stream) \
Copy link
Member

Choose a reason for hiding this comment

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

if you could add a comment above this line mentioning Bug #1797746 and why the noquote is present that would be nice to avoid accidental removals

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done! sorry for my poor english.

@uklotzde uklotzde changed the base branch from master to 2.2 October 22, 2018 10:42
@uklotzde uklotzde changed the base branch from 2.2 to master October 22, 2018 10:45
@uklotzde
Copy link
Contributor

Please rebase on the 2.2 branch and retarget this PR to 2.2. Switching the target branch of this PR didn't work as expected.

@banad60 banad60 force-pushed the patch-1 branch 3 times, most recently from 25588ae to 8e75f0c Compare October 22, 2018 21:56
Fix for https://bugs.launchpad.net/mixxx/+bug/1797746

Without this patch, debugging messages in mixxx.log are
quoted since QT > 5.4, which breaks output of engine.log()
escape characters.

This patch adds .noquote() to QDebug if QT_VERSION >= 5.4
@Be-ing Be-ing changed the base branch from master to 2.2 October 22, 2018 22:05
@Be-ing
Copy link
Member

Be-ing commented Oct 22, 2018

Thank you for rebasing. @banad60 can you confirm that you have signed the contributor agreement linked above?

@banad60
Copy link
Contributor Author

banad60 commented Oct 22, 2018

Thank you for rebasing. @banad60 can you confirm that you have signed the contributor agreement linked above?

@Be-ing, @rryan, Yes, I can. I signed the contributor agreement with name banad60 two days ago..

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

4 participants