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

[qtbase] clang source location fix #31360

Merged
merged 4 commits into from
Jun 22, 2023

Conversation

Neumann-A
Copy link
Contributor

Tries fixing #31354

Cheney-W
Cheney-W previously approved these changes May 10, 2023
@Cheney-W Cheney-W added category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines labels May 10, 2023
@@ -7,7 +7,7 @@ index 823b2057b..4a8cd4fa8 100644
#include <QtCore/qpropertyprivate.h>

-#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC)
+#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC) && defined(__cpp_consteval)
+#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC) && ( (defined(__cpp_consteval) && defined(_MSC_VER)) || !defined(_MSC_VER) )
Copy link
Contributor

Choose a reason for hiding this comment

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

Hi @Neumann-A, has this been confirmed to fix the issue? It's not obvious that this does anything.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

confirmed by #31354 (comment)

@JavierMatosD JavierMatosD marked this pull request as draft May 10, 2023 19:32
@dan-shaw dan-shaw removed the info:reviewed Pull Request changes follow basic guidelines label Jun 1, 2023
…ation-fix

# Conflicts:
#	ports/qtbase/vcpkg.json
#	versions/baseline.json
#	versions/q-/qtbase.json
@Neumann-A Neumann-A marked this pull request as ready for review June 20, 2023 20:47
@Cheney-W Cheney-W added the info:reviewed Pull Request changes follow basic guidelines label Jun 21, 2023
@vicroms vicroms merged commit 6258ccf into microsoft:master Jun 22, 2023
15 checks passed
@Neumann-A Neumann-A deleted the qtbase-source-location-fix branch June 22, 2023 06:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants