From 0b3fb8e907ece47187cc9af3cdb0f018c7df37ec Mon Sep 17 00:00:00 2001
From: Adrian Herrmann <adrian.herrmann@qt.io>
Date: Tue, 14 Feb 2023 15:21:51 +0100
Subject: 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>
---
 sources/pyside6/libpyside/pyside.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sources/pyside6/libpyside/pyside.cpp')

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;
     }
-- 
cgit v1.2.3