diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-12-22 11:41:03 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2024-01-10 02:25:24 +0000 |
| commit | 37e2aa7698a16fb5bc0d2f74388620d921d977c3 (patch) | |
| tree | 0174de0db1348b8181740bf2e15c757f1abb3763 /tests/auto/tools/moc/tst_moc.cpp | |
| parent | 7fe7ed0a3f6c40cb4d5d060ea3cb30d1566a6998 (diff) | |
Dissociate QTypeRevision from QVersionNumber
They have nothing to do with each other, so give QTypeRevision its own
header and implementation file instead of piggy-backing on
QVersionNumber's.
Picking back to current LTS to incur the merge conflict only once, not
per (expected) follow-up change.
Amends ed080c64ae21d22115d16780a5903d7cc4fd1546.
Pick-to: 6.7 6.6 6.5
Change-Id: I2fa5d0e68f95864126bc95e3d8154134eee85553
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/tools/moc/tst_moc.cpp')
| -rw-r--r-- | tests/auto/tools/moc/tst_moc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index a7fe0e9455..e12a1d66e4 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -8,8 +8,8 @@ #include <qobject.h> #include <qmetaobject.h> #include <qjsondocument.h> -#include <qversionnumber.h> #include <qregularexpression.h> +#include <qtyperevision.h> #include <private/qobject_p.h> |