646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
26 lines
864 B
Diff
26 lines
864 B
Diff
--- a/src/linguist/shared/runqttool.cpp
|
|
+++ b/src/linguist/shared/runqttool.cpp
|
|
@@ -20,9 +20,21 @@ class FMT {
|
|
Q_DECLARE_TR_FUNCTIONS(Linguist)
|
|
};
|
|
|
|
+static QString qtBasePath(QLibraryInfo::LibraryPath location)
|
|
+{
|
|
+ switch (location) {
|
|
+ case QLibraryInfo::BinariesPath:
|
|
+ return QLatin1String(NIX_OUTPUT_OUT) + QLatin1String("/bin");
|
|
+ case QLibraryInfo::LibraryExecutablesPath:
|
|
+ return QLatin1String(NIX_OUTPUT_OUT) + QLatin1String("/libexec");
|
|
+ default:
|
|
+ return QLibraryInfo::path(location);
|
|
+ }
|
|
+}
|
|
+
|
|
static QString qtToolFilePath(const QString &toolName, QLibraryInfo::LibraryPath location)
|
|
{
|
|
- QString filePath = QLibraryInfo::path(location) + QLatin1Char('/') + toolName;
|
|
+ QString filePath = qtBasePath(location) + QLatin1Char('/') + toolName;
|
|
#ifdef Q_OS_WIN
|
|
filePath.append(QLatin1String(".exe"));
|
|
#endif
|