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

Disabled broken scaling feature on Linux Qt environments #128

Merged
merged 3 commits into from
Sep 10, 2013
Merged

Disabled broken scaling feature on Linux Qt environments #128

merged 3 commits into from
Sep 10, 2013

Conversation

Vality
Copy link
Contributor

@Vality Vality commented Sep 9, 2013

No description provided.

@@ -84,8 +84,11 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
res.transpose();
pixel_xres = res.width();
pixel_yres = res.height();

#ifdef Q_WS_X11
Copy link
Contributor

Choose a reason for hiding this comment

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

@xsacha is this define safe?

-[Unknown]

Copy link
Contributor

Choose a reason for hiding this comment

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

Q_WS_X11 will be defined for Meego, Raspberry Pi, Pandora, ... as well. Is that the intention?
I usually use #if defined(Q_WS_X11) && !defined(ARM) to avoid mobile platforms. See below.

Looks like you might want it on Raspberry Pi though -- since it acts like a normal desktop.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is also possible for a normal linux desktop to be running with an ARM CPU. I think the quickest way to avoid those platforms is to explicitly check for them. Though ugly I cant think of some 'normal desktop pc' flag. Editing.

@Vality
Copy link
Contributor Author

Vality commented Sep 10, 2013

@unknownbrackets I think that should make it considerably safer. It avoids all supported mobile platforms without excluding any desktops. I would have liked something more comprehensive but there is not any kind of ifdef for portable devices in general unfortunately.

I can confirm it fixes hrydgard/ppsspp#3710

hrydgard added a commit that referenced this pull request Sep 10, 2013
Disabled broken scaling feature on Linux Qt environments
@hrydgard hrydgard merged commit b3c6a8b into hrydgard:master Sep 10, 2013
@@ -17,6 +17,10 @@
#endif
#include "QtMain.h"

#if defined(Q_WS_X11) && !defined(MEEGO_EDITION_HARMATTAN) && !defined(__SYMBIAN32__) && !defined(BLACKBERRY)
Copy link
Contributor

Choose a reason for hiding this comment

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

Out of those, only Meego uses X11.

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.

4 participants