Skip to content

Save QT rules for llvm-toolchain#7069

Merged
waruqi merged 2 commits intoxmake-io:devfrom
MaxwellGengYF:dev
Nov 27, 2025
Merged

Save QT rules for llvm-toolchain#7069
waruqi merged 2 commits intoxmake-io:devfrom
MaxwellGengYF:dev

Conversation

@MaxwellGengYF
Copy link
Contributor

These cxx-flags is only for cl.exe and clang_cl.exe

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @MaxwellGengYF, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refines the application of specific C++ compiler flags within the XMake QT rules. It ensures that certain flags, previously applied broadly on Windows for QT 6.0+, are now conditionally applied only when using Microsoft's cl.exe or Clang's clang_cl.exe compilers, preventing potential issues with other toolchains.

Highlights

  • Conditional CXX Flags for QT Rules: The cxxflags /Zc:__cplusplus and /permissive- are now applied only when using clang_cl or cl compilers within the QT rules for Windows platforms and QT SDK version 6.0 or greater.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@@ -225,8 +225,8 @@ function main(target, opt)
if qt_sdkver:ge("6.0") then
-- @see https://github.com/xmake-io/xmake/issues/2071
if target:is_plat("windows") then
Copy link
Member

Choose a reason for hiding this comment

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

直接判断就行了。

if target:is_plat("windows") and target:has_tool("cxx", "clang_cl", "cl") then

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request correctly restricts the MSVC-specific compiler flags /Zc:__cplusplus and /permissive- to cl.exe and clang-cl.exe when building Qt projects on Windows. This prevents issues when using other toolchains like MinGW/GCC on Windows. The change is logical and well-implemented. I have one suggestion to make the code slightly more concise by combining the two target:add calls into a single one.

Comment on lines +228 to +229
target:add("cxxflags", "/Zc:__cplusplus", { tools = {"clang_cl", "cl"} })
target:add("cxxflags", "/permissive-", { tools = {"clang_cl", "cl"} })
Copy link
Contributor

Choose a reason for hiding this comment

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

medium

For conciseness, you can combine these two target:add calls into a single call. The target:add function supports adding multiple values at once.

            target:add("cxxflags", "/Zc:__cplusplus", "/permissive-", { tools = {"clang_cl", "cl"} })

@waruqi waruqi added this to the v3.0.6 milestone Nov 27, 2025
@waruqi waruqi merged commit 4be95ee into xmake-io:dev Nov 27, 2025
33 checks passed
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.

2 participants