1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtCore: fix build w/o itemmodel

Browse Source 
removed_api.cpp included qabstractitemmodel.h unconditionally.
Wrap it in #if QT_CONFIG(itemmodel)

As a drive-by, add the missing blank line after the initial

    #if QT_CORE_REMOVED_SINCE(6, 8)

Amends cbda9583521633fa6e8a9274d2e47aa14c8bd175.

Pick-to: 6.8
Change-Id: I6888d9a76078a2473a0a8f063cf8b93ac3025385
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 32d23904b29fcab0d7dfca3d6ac9b97563ba88ff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Axel Spoerl 2025-03-21 12:25:13 +01:00 committed by Qt Cherry-pick Bot
parent ce0349b410
commit f06b8f1779
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/compat/removed_api.cpp
View File

@ -928,6 +928,8 @@ QUrl QUrl::fromEncoded(const QByteArray &input, ParsingMode mode)
#endif // QT_CORE_REMOVED_SINCE(6, 7)
#if QT_CORE_REMOVED_SINCE(6, 8)
#if QT_CONFIG(itemmodel)
#include "qabstractitemmodel.h"
bool QPersistentModelIndex::operator<(const QPersistentModelIndex &other) const noexcept
@ -950,6 +952,8 @@ bool QPersistentModelIndex::operator!=(const QModelIndex &other) const noexcept
return !comparesEqual(*this, other);
}
#endif // QT_CONFIG(itemmodel)
#include "qbitarray.h" // inlined API
#include "qbytearray.h" // inlined API