diff options
| author | Adrian Herrmann <adrian.herrmann@qt.io> | 2023-02-14 15:21:51 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-15 11:21:12 +0000 |
| commit | 26b0fa4ad37b518175cbbba24ef78477429ec80d (patch) | |
| tree | 748f4d0ee821097bff3bf6adb9d444814c8a4e1f | |
| parent | d78c03e058950a7948b8d6271ab8991cdb65f186 (diff) | |
Fix '&&' within '||' warnings
Placing parentheses around the '&&' expression silences this warning.
Change-Id: Ic7884834de1fd3e38b7477d3946b8757d40e27ba
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 0b3fb8e907ece47187cc9af3cdb0f018c7df37ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 06a6b2e70..29dd8d7e8 100644 --- a/sources/pyside6/libpyside/pyside.cpp +++ b/sources/pyside6/libpyside/pyside.cpp @@ -852,8 +852,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; } |