diff options
| author | Niclas Rosenvik <youremailsarecrap@gmail.com> | 2022-11-01 22:31:27 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-11-02 15:50:17 +0000 |
| commit | c736528086cc6d8ede1a49ccbae08ea1f363dca4 (patch) | |
| tree | 40eec9928782d66b560d101d89f355e3129d2293 /src/corelib | |
| parent | 772730f5c4c56354eb9c28ccfa68bd8cda543bad (diff) | |
| download | qtbase-c736528086cc6d8ede1a49ccbae08ea1f363dca4.tar.gz | |
Fix redefine of QT_NO_VERSION_TAGGING warnings
If a user requests no version tagging by
defining QT_NO_VERSION_TAGGING a lot of
redefine warnings will be output from the
compiler when building corelib.
So only define QT_NO_VERSION_TAGGING if it
is not already defined.
Change-Id: I56609b3589184bda7bec52d168d9fd11e2f14a2c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 265b1369a397efd47fc13dbcb76a3439cccfe207)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qversiontagging.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qversiontagging.h b/src/corelib/global/qversiontagging.h index 4e0eb68bbd..e64cae1d87 100644 --- a/src/corelib/global/qversiontagging.h +++ b/src/corelib/global/qversiontagging.h @@ -73,7 +73,7 @@ struct QVersionTag }; } -#if defined(QT_BUILD_CORE_LIB) || defined(QT_BOOTSTRAPPED) || defined(QT_STATIC) +#if !defined(QT_NO_VERSION_TAGGING) && (defined(QT_BUILD_CORE_LIB) || defined(QT_BOOTSTRAPPED) || defined(QT_STATIC)) // don't make tags in QtCore, bootstrapped systems or if the user asked not to # define QT_NO_VERSION_TAGGING #endif |