diff --git a/libs/qt5/qtdeclarative/.qt-5.12.0/0001-QQuickTableView-connect-directly-to-the-model-and-no.patch b/libs/qt5/qtdeclarative/.qt-5.12.0/0001-QQuickTableView-connect-directly-to-the-model-and-no.patch new file mode 100644 index 00000000..a8adf714 --- /dev/null +++ b/libs/qt5/qtdeclarative/.qt-5.12.0/0001-QQuickTableView-connect-directly-to-the-model-and-no.patch @@ -0,0 +1,46 @@ +From e1a0e894aa09dd1323a7792192f1d68ee6677f8a Mon Sep 17 00:00:00 2001 +From: Richard Moe Gustavsen +Date: Mon, 26 Nov 2018 11:07:22 +0100 +Subject: [PATCH] QQuickTableView: connect directly to the model, and not to + the QPointer + +Fixes building with gcc 4.8.4 + +Change-Id: I61810102bba20c21321112c63e7197bbe05ec27d +Reviewed-by: Mitch Curtis +Reviewed-by: Michael Brasser +--- + src/quick/items/qquicktableview.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp +index 7bbbd29e3..eaf0e4cf8 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()) { +-- +2.20.1.windows.1 + diff --git a/libs/qt5/qtdeclarative/qtdeclarative.py b/libs/qt5/qtdeclarative/qtdeclarative.py index 79c781cf..ff5d68e8 100644 --- a/libs/qt5/qtdeclarative/qtdeclarative.py +++ b/libs/qt5/qtdeclarative/qtdeclarative.py @@ -1,26 +1,27 @@ # -*- coding: utf-8 -*- import info class subinfo(info.infoclass): def setTargets(self): + self.patchToApply["5.12.0"] = [(".qt-5.12.0", 1)] self.versionInfo.setDefaultValues() def setDependencies(self): self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["libs/qt5/qtxmlpatterns"] = None self.runtimeDependencies["libs/qt5/qtsvg"] = None self.runtimeDependencies["libs/d3dcompiler"] = None from Package.Qt5CorePackageBase import * class QtPackage(Qt5CorePackageBase): def __init__(self, **args): Qt5CorePackageBase.__init__(self) class Package(Qt5CoreSdkPackageBase): def __init__(self): Qt5CoreSdkPackageBase.__init__(self, classA=QtPackage)