mirror of https://git.wownero.com/dsc/mxe.git
qtdeclarative: fix build with gcc4.8
This commit is contained in:
parent
8881636975
commit
1c77cfc078
|
@ -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 <richard.gustavsen@qt.io>
|
||||||
|
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 <mitch.curtis@qt.io>
|
||||||
|
Reviewed-by: Michael Brasser <michael.brasser@live.com>
|
||||||
|
|
||||||
|
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()) {
|
Loading…
Reference in New Issue