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 16:56:57 +0200 |
| commit | f93263d2f4d94e20131668dc60a40114ad183942 (patch) | |
| tree | a000c75eed921dc6d8801b554208760f09580199 /sources/shiboken2/generator | |
| parent | 5092804aa3e9cbf398d1cc5edf0381d4e54e8182 (diff) | |
| parent | 4a4e44c6f8487f882d443ebfc05795cc75ba5e6e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If40b0ab35cd2ad2bd0d982881094ce3dbf46ccf3
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(':'); |