diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-05-07 00:00:56 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-05-07 00:00:56 +0100 |
| commit | 7bcfea9c5e79a425a62a66bba477b9d3c0d7fdd0 (patch) | |
| tree | 02bad8e4f1f060d4858a1a2ec3fc9404f0b7a197 /dev-qt/qt-creator/files | |
| parent | 43c2a85d4e20318dd3d35872e348707900870067 (diff) | |
gentoo auto-resync : 07:05:2024 - 00:00:56
Diffstat (limited to 'dev-qt/qt-creator/files')
| -rw-r--r-- | dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch b/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch new file mode 100644 index 000000000000..986f328fa8eb --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch @@ -0,0 +1,29 @@ +Building with Qt6.7.1 needs [1] and a part of [2]+[3]. [2] was intended +to fix building with Qt6.8 but turned out part of it was needed for 6.7.1 +and this was adjusted in [3]. [2] does not apply cleanly so only taking +the bit needed given 6.8 can wait for a proper release. + +[1] https://github.com/qt-creator/qt-creator/commit/041727fb2 +[2] https://github.com/qt-creator/qt-creator/commit/6babc022d +[3] https://github.com/qt-creator/qt-creator/commit/fcf2d2064 +--- a/src/libs/utils/fsengine/fsengine_impl.h ++++ b/src/libs/utils/fsengine/fsengine_impl.h +@@ -52,4 +52,7 @@ + uint ownerId(FileOwner) const override; + QString owner(FileOwner) const override; ++ #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 1) ++ using FileTime = QFile::FileTime; ++ #endif + bool setFileTime(const QDateTime &newDate, FileTime time) override; + QDateTime fileTime(FileTime time) const override; +--- a/src/plugins/languageclient/languageclientutils.cpp ++++ b/src/plugins/languageclient/languageclientutils.cpp +@@ -236,6 +236,6 @@ + Client *client = LanguageClientManager::clientForDocument(textEditor->textDocument()); + +- ClientExtras *extras = widget->findChild<ClientExtras *>(clientExtrasName, +- Qt::FindDirectChildrenOnly); ++ ClientExtras *extras = dynamic_cast<ClientExtras *>( ++ widget->findChild<QObject *>(clientExtrasName, Qt::FindDirectChildrenOnly)); + if (!extras) { + if (!client) |