diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2022-03-19 15:19:17 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2022-03-19 16:26:58 +0000 |
| commit | da0e29314591ad9cb3efd180b434ea1246c2f396 (patch) | |
| tree | bef36d991337535c7108cc988813cb54db2a28ef | |
| parent | a7a3817b281dfb592a529f169dcd2970b6a575a4 (diff) | |
| download | ports-da0e29314591ad9cb3efd180b434ea1246c2f396.tar.gz ports-da0e29314591ad9cb3efd180b434ea1246c2f396.zip | |
devel/qtcreator: fix build on i386
The issue was noted in the exp-run for KF5-5.92 but is unrelated to it.
PR: 262522
Upstream PR: https://bugreports.qt.io/browse/QTCREATORBUG-26910
Submitted by: Christophe Giboudeaux <christophe@krop.fr>
| -rw-r--r-- | devel/qtcreator/files/patch-git_b3e9f24 | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/devel/qtcreator/files/patch-git_b3e9f24 b/devel/qtcreator/files/patch-git_b3e9f24 new file mode 100644 index 000000000000..db1821dbb271 --- /dev/null +++ b/devel/qtcreator/files/patch-git_b3e9f24 @@ -0,0 +1,42 @@ +From: Marco Bubke <marco.bubke@qt.io> +Date: Mon, 24 Jan 2022 13:38:29 +0000 (+0100) +Subject: QmlDesigner: Fix 32 bit +X-Git-Tag: qds/v3.0.0~7 +X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt-creator%2Fqt-creator.git;a=commitdiff_plain;h=b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a;hp=e05ecea4f52174db2e9e2a4e7d5b9c59bae1fd6f + +QmlDesigner: Fix 32 bit + +Because std::ptrdiff_t and int are the same under 32 bit the constructor +is changed to a template. The class is private so it is very unlikely +that it leads to errors. + +Task-number: QTCREATORBUG-26910 +Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd +Reviewed-by: <github-actions-qt-creator@cristianadam.eu> +Reviewed-by: Christophe Giboudeaux <christophe@krop.fr> +Reviewed-by: Eike Ziller <eike.ziller@qt.io> +Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> +--- + +diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h +index 747c3d9a07d..27d2905e8e4 100644 +--- src/plugins/qmldesigner/designercore/projectstorage/storagecache.h ++++ src/plugins/qmldesigner/designercore/projectstorage/storagecache.h +@@ -67,15 +67,8 @@ class StorageCache + + StorageCacheIndex(const char *) = delete; + +- constexpr explicit StorageCacheIndex(int id) noexcept +- : id{id} +- {} +- +- constexpr explicit StorageCacheIndex(std::size_t id) noexcept +- : id{static_cast<int>(id)} +- {} +- +- constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept ++ template<typename IntegerType> ++ constexpr explicit StorageCacheIndex(IntegerType id) noexcept + : id{static_cast<int>(id)} + {} + |