aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/platform
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-03-10 10:40:47 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-03-12 15:48:31 +0100
commit92dc998f6d27347842fd57b0a1c6220426eb9ee2 (patch)
treee0a6a58645c1146dcad671d8cf08108aadefab13 /src/imports/platform
parent1eb249477fb510e4950c53a6a4191af79f4fbc98 (diff)
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>
Diffstat (limited to 'src/imports/platform')
-rw-r--r--src/imports/platform/qquickplatformdialog.cpp2
-rw-r--r--src/imports/platform/qquickplatformmenu.cpp2
-rw-r--r--src/imports/platform/qquickplatformmenubar.cpp2
-rw-r--r--src/imports/platform/qquickplatformmenuitem.cpp2
-rw-r--r--src/imports/platform/qquickplatformmenuitemgroup.cpp2
-rw-r--r--src/imports/platform/qquickplatformsystemtrayicon.cpp2
6 files changed, 12 insertions, 0 deletions
diff --git a/src/imports/platform/qquickplatformdialog.cpp b/src/imports/platform/qquickplatformdialog.cpp
index 2a785bbc..983c2766 100644
--- a/src/imports/platform/qquickplatformdialog.cpp
+++ b/src/imports/platform/qquickplatformdialog.cpp
@@ -407,3 +407,5 @@ QWindow *QQuickPlatformDialog::findParentWindow() const
}
QT_END_NAMESPACE
+
+#include "moc_qquickplatformdialog_p.cpp"
diff --git a/src/imports/platform/qquickplatformmenu.cpp b/src/imports/platform/qquickplatformmenu.cpp
index 1f5f52d7..8954d439 100644
--- a/src/imports/platform/qquickplatformmenu.cpp
+++ b/src/imports/platform/qquickplatformmenu.cpp
@@ -938,3 +938,5 @@ void QQuickPlatformMenu::updateIcon()
}
QT_END_NAMESPACE
+
+#include "moc_qquickplatformmenu_p.cpp"
diff --git a/src/imports/platform/qquickplatformmenubar.cpp b/src/imports/platform/qquickplatformmenubar.cpp
index 99757829..592a6bfe 100644
--- a/src/imports/platform/qquickplatformmenubar.cpp
+++ b/src/imports/platform/qquickplatformmenubar.cpp
@@ -328,3 +328,5 @@ void QQuickPlatformMenuBar::menus_clear(QQmlListProperty<QQuickPlatformMenu> *pr
}
QT_END_NAMESPACE
+
+#include "moc_qquickplatformmenubar_p.cpp"
diff --git a/src/imports/platform/qquickplatformmenuitem.cpp b/src/imports/platform/qquickplatformmenuitem.cpp
index fa3fdafb..e5741b6b 100644
--- a/src/imports/platform/qquickplatformmenuitem.cpp
+++ b/src/imports/platform/qquickplatformmenuitem.cpp
@@ -623,3 +623,5 @@ void QQuickPlatformMenuItem::updateIcon()
}
QT_END_NAMESPACE
+
+#include "moc_qquickplatformmenuitem_p.cpp"
diff --git a/src/imports/platform/qquickplatformmenuitemgroup.cpp b/src/imports/platform/qquickplatformmenuitemgroup.cpp
index 7e091881..e0773bb1 100644
--- a/src/imports/platform/qquickplatformmenuitemgroup.cpp
+++ b/src/imports/platform/qquickplatformmenuitemgroup.cpp
@@ -388,3 +388,5 @@ void QQuickPlatformMenuItemGroup::items_clear(QQmlListProperty<QQuickPlatformMen
}
QT_END_NAMESPACE
+
+#include "moc_qquickplatformmenuitemgroup_p.cpp"
diff --git a/src/imports/platform/qquickplatformsystemtrayicon.cpp b/src/imports/platform/qquickplatformsystemtrayicon.cpp
index da483822..4a96b38f 100644
--- a/src/imports/platform/qquickplatformsystemtrayicon.cpp
+++ b/src/imports/platform/qquickplatformsystemtrayicon.cpp
@@ -482,3 +482,5 @@ void QQuickPlatformSystemTrayIcon::updateIcon()
}
QT_END_NAMESPACE
+
+#include "moc_qquickplatformsystemtrayicon_p.cpp"