diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-24 11:45:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-24 13:10:57 +0200 |
| commit | 9a189a096f134e80e0c11523db14c8580275b4ad (patch) | |
| tree | 154a408d7607a9aa9cf10f66ed552dfbcfe18292 /src/corelib/global/qoperatingsystemversion.h | |
| parent | 999f62531a784b8f0f1f6d3cb7aaaa5455485d17 (diff) | |
Remove non-Qt6 compile time switches from QtCore
We already manage to compile without this code, and none of it are full
classes or separate functions suitable for qt5compat.
Change-Id: I47facac7ec621cfc4b0b26214b7de37897443519
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/global/qoperatingsystemversion.h')
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index f22878de89..60243dd898 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -145,7 +145,7 @@ private: static int compare(const QOperatingSystemVersion &v1, const QOperatingSystemVersion &v2); }; -Q_DECLARE_TYPEINFO(QOperatingSystemVersion, QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ? Q_RELOCATABLE_TYPE : Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QOperatingSystemVersion, Q_PRIMITIVE_TYPE); #ifndef QT_NO_DEBUG_STREAM class QDebug; |