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

[Qt5-compat] Change Q_WS_* macroses to Q_OS_* #1743

Merged
merged 2 commits into from
Jan 5, 2015
Merged

[Qt5-compat] Change Q_WS_* macroses to Q_OS_* #1743

merged 2 commits into from
Jan 5, 2015

Conversation

naihil
Copy link
Contributor

@naihil naihil commented Dec 23, 2014

Q_WS_* macros removed from Qt5, to determine platform use Q_OS_* macros which exists in Qt4 and Qt5

@dakcarto
Copy link
Member

@m-kuhn This appears to be necessary (thank you @naihil). Seems to be missing the changes for the new internal qwtpolar though. Should those edits be added?

@naihil
Copy link
Contributor Author

naihil commented Dec 24, 2014

One more thing:
In multiple places Q_WS_X11 macro used, which removed from qt5 too. And there is no simple way to determine window server (X/Wayland), but i dont have linux box with qt5 now, may be wrong.

@m-kuhn
Copy link
Member

m-kuhn commented Dec 24, 2014

@naihil Thank you.
X11/Wayland seems not to be a compile-time but a run-time switch (see http://lists.qt-project.org/pipermail/interest/2013-June/007548.html )
Q_OS_UNIX can be used there, which will trigger for Linux/X11 builds. If problems surface once people start running Wayland we can still react. Actually it's the Q_WS_X11 macro is not used much.

I assume this does not break any Qt4 builds from what I have read?

Internal qwtpolar does not work with Qt5 anyway and needs to be built externally, so I don't think it makes sense to change anything there.

@naihil
Copy link
Contributor Author

naihil commented Dec 24, 2014

Ok, changed all Q_WS_* macroses, except those in qwtpolar.

I dont try to build with internal qwtpolar, external qwtpolar-1.1.1 builds fine with Qt5

@naihil naihil changed the title [Qt5-compat] Change Q_WS_WIN/WIN32/MAC/MACX macroses to Q_OS_* [Qt5-compat] Change Q_WS_* macroses to Q_OS_* Dec 24, 2014
m-kuhn added a commit that referenced this pull request Jan 5, 2015
[Qt5-compat] Change Q_WS_* macroses to Q_OS_*
@m-kuhn m-kuhn merged commit df2cac7 into qgis:master Jan 5, 2015
@m-kuhn
Copy link
Member

m-kuhn commented Jan 5, 2015

Thank you @naihil

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