From 1c77cfc078e26b1e0adaca464cc39aadff0c2c95 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 24 Dec 2018 19:42:22 +1100 Subject: qtdeclarative: fix build with gcc4.8 --- src/qtdeclarative-1-fixes.patch | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/qtdeclarative-1-fixes.patch diff --git a/src/qtdeclarative-1-fixes.patch b/src/qtdeclarative-1-fixes.patch new file mode 100644 index 0000000..b792f3c --- /dev/null +++ b/src/qtdeclarative-1-fixes.patch @@ -0,0 +1,46 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Richard Moe Gustavsen +Date: Mon, 26 Nov 2018 11:07:22 +0100 +Subject: [PATCH 1/1] QQuickTableView: connect directly to the model, and not + to the QPointer + +Fixes building with gcc 4.8.4 + +From: https://codereview.qt-project.org/#/c/246558/2//ALL,unified + +Change-Id: I61810102bba20c21321112c63e7197bbe05ec27d +Reviewed-by: Mitch Curtis +Reviewed-by: Michael Brasser + +diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp +index 1111111..2222222 100644 +--- a/src/quick/items/qquicktableview.cpp ++++ b/src/quick/items/qquicktableview.cpp +@@ -1647,8 +1647,9 @@ void QQuickTableViewPrivate::connectToModel() + QObjectPrivate::connect(model, &QQmlInstanceModel::initItem, this, &QQuickTableViewPrivate::initItemCallback); + + if (tableModel) { +- QObjectPrivate::connect(tableModel, &QQmlTableInstanceModel::itemPooled, this, &QQuickTableViewPrivate::itemPooledCallback); +- QObjectPrivate::connect(tableModel, &QQmlTableInstanceModel::itemReused, this, &QQuickTableViewPrivate::itemReusedCallback); ++ const auto tm = tableModel.data(); ++ QObjectPrivate::connect(tm, &QQmlTableInstanceModel::itemPooled, this, &QQuickTableViewPrivate::itemPooledCallback); ++ QObjectPrivate::connect(tm, &QQmlTableInstanceModel::itemReused, this, &QQuickTableViewPrivate::itemReusedCallback); + } + + if (auto const aim = model->abstractItemModel()) { +@@ -1678,8 +1679,9 @@ void QQuickTableViewPrivate::disconnectFromModel() + QObjectPrivate::disconnect(model, &QQmlInstanceModel::initItem, this, &QQuickTableViewPrivate::initItemCallback); + + if (tableModel) { +- QObjectPrivate::disconnect(tableModel, &QQmlTableInstanceModel::itemPooled, this, &QQuickTableViewPrivate::itemPooledCallback); +- QObjectPrivate::disconnect(tableModel, &QQmlTableInstanceModel::itemReused, this, &QQuickTableViewPrivate::itemReusedCallback); ++ const auto tm = tableModel.data(); ++ QObjectPrivate::disconnect(tm, &QQmlTableInstanceModel::itemPooled, this, &QQuickTableViewPrivate::itemPooledCallback); ++ QObjectPrivate::disconnect(tm, &QQmlTableInstanceModel::itemReused, this, &QQuickTableViewPrivate::itemReusedCallback); + } + + if (auto const aim = model->abstractItemModel()) { -- cgit v0.12