Fix build failures as a result of QMetaType changes in qtbase

moc now stores the QMetaType of properties as a result of
46f407126ef3e94d59254012cdc34d6a4ad2faf2 in qtbase, which requires
full type information about the property type inside the moc generated
source file.

Many of the property types were forward-declared, and this resulted
in build errors like
  "invalid application of 'sizeof' to an incomplete type 'QQuickTransition'"

Make sure to explicitly include the moc files inside the counterpart
.cpp files, so that full information is available from included headers.

Fixes: QTBUG-82774
Change-Id: I5971713864992398daed72ce9f6ab866668cf8e1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
This commit is contained in:
Alexandru Croitor 2020-03-10 10:40:47 +01:00
parent 1eb249477f
commit 92dc998f6d
18 changed files with 37 additions and 0 deletions

View File

@ -385,3 +385,5 @@ void DocumentHandler::setModified(bool m)
if (m_document) if (m_document)
m_document->textDocument()->setModified(m); m_document->textDocument()->setModified(m);
} }
#include "moc_documenthandler.cpp"

View File

@ -407,3 +407,5 @@ QWindow *QQuickPlatformDialog::findParentWindow() const
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickplatformdialog_p.cpp"

View File

@ -938,3 +938,5 @@ void QQuickPlatformMenu::updateIcon()
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickplatformmenu_p.cpp"

View File

@ -328,3 +328,5 @@ void QQuickPlatformMenuBar::menus_clear(QQmlListProperty<QQuickPlatformMenu> *pr
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickplatformmenubar_p.cpp"

View File

@ -623,3 +623,5 @@ void QQuickPlatformMenuItem::updateIcon()
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickplatformmenuitem_p.cpp"

View File

@ -388,3 +388,5 @@ void QQuickPlatformMenuItemGroup::items_clear(QQmlListProperty<QQuickPlatformMen
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickplatformmenuitemgroup_p.cpp"

View File

@ -482,3 +482,5 @@ void QQuickPlatformSystemTrayIcon::updateIcon()
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickplatformsystemtrayicon_p.cpp"

View File

@ -316,3 +316,5 @@ QQuickItem *QQuickTumblerView::view()
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquicktumblerview_p.cpp"

View File

@ -1177,3 +1177,5 @@ QAccessible::Role QQuickAbstractButton::accessibleRole() const
#endif #endif
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickabstractbutton_p.cpp"

View File

@ -1966,3 +1966,5 @@ void QQuickComboBox::accessibilityActiveChanged(bool active)
#endif // #endif //
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickcombobox_p.cpp"

View File

@ -265,3 +265,5 @@ QPalette QQuickDelayButton::defaultPalette() const
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickdelaybutton_p.cpp"

View File

@ -183,3 +183,5 @@ QAccessible::Role QQuickMenuBarItem::accessibleRole() const
#endif #endif
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickmenubaritem_p.cpp"

View File

@ -277,3 +277,5 @@ QAccessible::Role QQuickMenuItem::accessibleRole() const
#endif #endif
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickmenuitem_p.cpp"

View File

@ -70,3 +70,5 @@ void QQuickPopupAnchors::resetCenterIn()
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickpopupanchors_p.cpp"

View File

@ -1176,3 +1176,5 @@ qreal QQuickSpinButton::implicitIndicatorHeight() const
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickspinbox_p.cpp"

View File

@ -1383,3 +1383,5 @@ void QQuickStackViewAttached::resetVisible()
*/ */
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickstackview_p.cpp"

View File

@ -1383,3 +1383,6 @@ void QQuickSwipeDelegateAttached::setPressed(bool pressed)
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickswipe_p.cpp"
#include "moc_qquickswipedelegate_p.cpp"

View File

@ -474,3 +474,5 @@ bool QQuickSwipeViewAttached::isPreviousItem() const
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qquickswipeview_p.cpp"