diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-17 21:37:26 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-18 08:44:49 +0200 |
| commit | d243232974e600919389bfcb1302a37ae45ef3cc (patch) | |
| tree | 322afdac74129396c5a7952874278267783a4153 /src/corelib/kernel/qmetatype.h | |
| parent | 448ced2cba6bc5f72fed481c9f8b8ad74de5a9b5 (diff) | |
| parent | e3888dd932bae4cd630bf386d257cbfdcc4b5033 (diff) | |
Merge "Merge remote-tracking branch 'origin/wip/qt6' into dev"
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index d41f7ee80e..94a32cec02 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -500,7 +500,7 @@ public: typedef void (*Deleter)(void *); typedef void *(*Creator)(const void *); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +#if 1 || QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt6: fix this typedef void (*Destructor)(void *); typedef void *(*Constructor)(void *, const void *); // TODO Qt6: remove me #endif |