commit 892046ef90dfc13ee6fa10792bd56dbcf1feb2b7
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
---
src/Compare.cpp | 3 +--
src/support/Systemcall.cpp | 6 ++----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/Compare.cpp b/src/Compare.cpp
index bd7e0f2b07..09ae6b5ef4 100644
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -884,7 +884,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 6878a3a0fb..8680d57d4b 100644
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -702,10 +702,8 @@ void SystemcallPrivate::killProcess(QProcess * p)
}
}
-
+} // namespace support
+} // namespace lyx
#include "moc_SystemcallPrivate.cpp"
#endif
-
-} // namespace support
-} // namespace lyx
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
