diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-19 16:56:57 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-19 21:39:26 +0200 |
commit | c1df49025489fe76e15bbf76143b04157ad3bc40 (patch) | |
tree | 2182f322b76b0b56283eb415b443643014ee8161 /sources/shiboken2/generator | |
parent | 60db641632aaee28fb704a75476381568f17c863 (diff) | |
parent | f93263d2f4d94e20131668dc60a40114ad183942 (diff) |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'sources/shiboken2/generator')
-rw-r--r-- | sources/shiboken2/generator/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/generator/main.cpp b/sources/shiboken2/generator/main.cpp index 476e176d3..3c9d13b48 100644 --- a/sources/shiboken2/generator/main.cpp +++ b/sources/shiboken2/generator/main.cpp @@ -42,7 +42,7 @@ #include "headergenerator.h" #include "qtdocgenerator.h" -#ifdef _WINDOWS +#ifdef Q_OS_WIN static const QChar pathSplitter = QLatin1Char(';'); #else static const QChar pathSplitter = QLatin1Char(':'); |