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

Fixup qt6 build #3

Merged
merged 1 commit into from
Nov 27, 2023
Merged

Fixup qt6 build #3

merged 1 commit into from
Nov 27, 2023

Conversation

neochapay
Copy link
Contributor

No description provided.

@neochapay
Copy link
Contributor Author

@sledges ping

Copy link
Contributor

@Thaodan Thaodan left a comment

Choose a reason for hiding this comment

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

  1. Please squash the commit
  2. If I understand correctly this change is about supporting Qt6. The commit message should say so.
  3. Some files have their final newlines remove, please fix that.

@neochapay neochapay force-pushed the qt6 branch 3 times, most recently from 2f28550 to 25b01c5 Compare August 7, 2023 08:32
#include <QtGlobal>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <iodata-qt6/storage.h>
#elif QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Copy link
Contributor

Choose a reason for hiding this comment

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

These could have been just #else, but oh well.

@pvuorela pvuorela merged commit dc95f5d into sailfishos:master Nov 27, 2023
@@ -1 +1,6 @@
#include <QtGlobal>

Choose a reason for hiding this comment

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

Hey @neochapay this import doesn't actually exist right now. Instead (for Qt5) this would be qt5/QtCore/QtGlobal. Is some configuration missing in the .pro files to make this work?

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