diff options
| author | Adrian Herrmann <adrian.herrmann@qt.io> | 2023-02-14 15:21:51 +0100 |
|---|---|---|
| committer | Adrian Herrmann <adrian.herrmann@qt.io> | 2023-02-15 11:25:48 +0100 |
| commit | 0b3fb8e907ece47187cc9af3cdb0f018c7df37ec (patch) | |
| tree | ac7311107f111485a63dc62c6750cbd2f3445ca4 /sources/pyside6/libpyside/pyside.cpp | |
| parent | 1cf1c2424634d4e9360951a2e81651a0158e6fdc (diff) | |
Fix '&&' within '||' warnings
Placing parentheses around the '&&' expression silences this warning.
Pick-to: 6.4
Change-Id: Ic7884834de1fd3e38b7477d3946b8757d40e27ba
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside6/libpyside/pyside.cpp')
| -rw-r--r-- | sources/pyside6/libpyside/pyside.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside6/libpyside/pyside.cpp b/sources/pyside6/libpyside/pyside.cpp index 1ab5e337e..e92e0bfa4 100644 --- a/sources/pyside6/libpyside/pyside.cpp +++ b/sources/pyside6/libpyside/pyside.cpp @@ -839,8 +839,8 @@ bool registerInternalQtConf() bool runsInConda = qEnvironmentVariableIsSet("CONDA_DEFAULT_ENV") || qEnvironmentVariableIsSet("CONDA_PREFIX"); - if (!runsInConda && (disableInternalQtConf || executableQtConfAvailable) || - runsInConda && executableQt6ConfAvailable) { + if ((!runsInConda && (disableInternalQtConf || executableQtConfAvailable)) + || (runsInConda && executableQt6ConfAvailable)) { registrationAttempted = true; return false; } |