diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-22 10:07:00 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-26 09:09:19 +0200 |
| commit | 56b91d99cf975407908b9d9b19885c1a01c9a384 (patch) | |
| tree | a592ff35d81e5f1a7d9a0549e36824ebc4ef3fa0 /sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp | |
| parent | cb80bf8254c9bb23fd29fba80bbe4895fb1d286f (diff) | |
shiboken6: Fix warning about not returning a value in all control paths
Move #ifdef around in compilerFromCMake().
Amends 1db8fe5d80496be390e19d31ca9c8b87ed7579a4.
Pick-to: 6.3 6.2
Change-Id: I45b3a8fec0eeee289b2983b01d93fa8b09ded88d
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp')
| -rw-r--r-- | sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp index 9f28402cd..4eb1a9ee8 100644 --- a/sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp +++ b/sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp @@ -299,8 +299,8 @@ static QString compilerFromCMake(const QString &defaultCompiler) return compilerPath(); // Added !defined(Q_OS_DARWIN) due to PYSIDE-1032 QString result = defaultCompiler; - if (platform() != Platform::macOS) #ifdef CMAKE_CXX_COMPILER + if (platform() != Platform::macOS) result = QString::fromLocal8Bit(CMAKE_CXX_COMPILER); #endif return result; |