diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-08-21 02:32:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-08-21 02:32:50 +0200 |
| commit | 5a03b75c50b2e34552c7ec3e1e15e7b2a0128bf7 (patch) | |
| tree | 88e05cd6150e0b3cda4e8716668082c655007fb8 /mkspecs/features/data/macros.cpp | |
| parent | 0e7724079f1eae283714ae12769d1372b8f85659 (diff) | |
| parent | 6553921dd537e416da2f4d1441ab6d63059cda60 (diff) | |
Merge dev into 5.12
Change-Id: I63f632b595f66d2fc93e9aa713500e3799e3df2a
Diffstat (limited to 'mkspecs/features/data/macros.cpp')
| -rw-r--r-- | mkspecs/features/data/macros.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/features/data/macros.cpp b/mkspecs/features/data/macros.cpp index 9dcb8f0914..7a06fad1a6 100644 --- a/mkspecs/features/data/macros.cpp +++ b/mkspecs/features/data/macros.cpp @@ -27,3 +27,6 @@ QMAKE_GCC_MAJOR_VERSION = __GNUC__ QMAKE_GCC_MINOR_VERSION = __GNUC_MINOR__ QMAKE_GCC_PATCH_VERSION = __GNUC_PATCHLEVEL__ #endif +#ifdef __ghs__ +QMAKE_GHS_VERSION = __GHS_VERSION_NUMBER +#endif |