commit 69f61f5301673b3df07153b56371eeb1d6e6af37
Author: Juergen Spitzmueller <[email protected]>
Date: Fri Apr 11 14:18:39 2025 +0200
Fix compilation with Qt 6.9
which gets confused if moc_*.cpp
is included within the lyx:: namespace
(cherry picked from commit 892046ef90dfc13ee6fa10792bd56dbcf1feb2b7)
---
src/Compare.cpp | 3 +--
src/support/Systemcall.cpp | 6 ++----
status.24x | 2 ++
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/Compare.cpp b/src/Compare.cpp
index 82236aa8de..2b759b96b7 100644
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -885,7 +885,6 @@ void Compare::Impl::writeToDestBuffer(ParagraphList const &
pars) const
mergeParagraph(dest_buf_->params(), *dest_pars_, pit);
}
+} // namespace lyx
#include "moc_Compare.cpp"
-
-} // namespace lyx
diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index 7c4eaabc97..0ce85823ba 100644
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -706,10 +706,8 @@ void SystemcallPrivate::killProcess(QProcess * p)
}
}
-
+} // namespace support
+} // namespace lyx
#include "moc_SystemcallPrivate.cpp"
#endif
-
-} // namespace support
-} // namespace lyx
diff --git a/status.24x b/status.24x
index f534bf660f..226b17fb7c 100644
--- a/status.24x
+++ b/status.24x
@@ -143,4 +143,6 @@ What's new
- Fix compilation with gcc 15.
+- Fix compilation against Qt 6.9.
+
- Fix detection of necessary APIs to print callstacks.
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
