From 5eb04cdf9dc29a8ee9238da3a2e46dbfacacf9ec Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Thu, 8 Aug 2024 21:42:30 +0200 Subject: [PATCH] shared: Improve incremental compile times via explicit file includes When a source file contains an explicit include with a filename following the "moc_.cpp" pattern, then CMake's AUTOMOC generation tool will recognize the matching pair and generate the replacement header file and add the required include directory entries. For all files which do contain Q_OBJECT or similar declarations but do not have an explicit include directive, the global mocs_compilation.cpp file will still be generated (which groups all "missing" generated headers). The larger this global file is, the more expensive incremental compilation will be as this file (and all its contained generated headers) will be re-generated regardless of whether actual changes occurred. --- shared/properties-view/double-slider.cpp | 2 +- shared/properties-view/properties-view.cpp | 2 +- shared/properties-view/spinbox-ignorewheel.cpp | 2 +- shared/qt/plain-text-edit/plain-text-edit.cpp | 2 +- shared/qt/slider-ignorewheel/slider-ignorewheel.cpp | 2 +- shared/qt/vertical-scroll-area/vertical-scroll-area.cpp | 2 +- shared/qt/wrappers/qt-wrappers.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/shared/properties-view/double-slider.cpp b/shared/properties-view/double-slider.cpp index 993dfb95a..8996de12c 100644 --- a/shared/properties-view/double-slider.cpp +++ b/shared/properties-view/double-slider.cpp @@ -1,4 +1,4 @@ -#include "double-slider.hpp" +#include "moc_double-slider.cpp" #include diff --git a/shared/properties-view/properties-view.cpp b/shared/properties-view/properties-view.cpp index c71cbaab8..3f991aaaf 100644 --- a/shared/properties-view/properties-view.cpp +++ b/shared/properties-view/properties-view.cpp @@ -27,7 +27,7 @@ #include #include "double-slider.hpp" #include "spinbox-ignorewheel.hpp" -#include "properties-view.hpp" +#include "moc_properties-view.cpp" #include "properties-view.moc.hpp" #include diff --git a/shared/properties-view/spinbox-ignorewheel.cpp b/shared/properties-view/spinbox-ignorewheel.cpp index 0452b9337..aa599d836 100644 --- a/shared/properties-view/spinbox-ignorewheel.cpp +++ b/shared/properties-view/spinbox-ignorewheel.cpp @@ -1,4 +1,4 @@ -#include "spinbox-ignorewheel.hpp" +#include "moc_spinbox-ignorewheel.cpp" SpinBoxIgnoreScroll::SpinBoxIgnoreScroll(QWidget *parent) : QSpinBox(parent) { diff --git a/shared/qt/plain-text-edit/plain-text-edit.cpp b/shared/qt/plain-text-edit/plain-text-edit.cpp index 89e9ba8a1..b2a600e30 100644 --- a/shared/qt/plain-text-edit/plain-text-edit.cpp +++ b/shared/qt/plain-text-edit/plain-text-edit.cpp @@ -1,4 +1,4 @@ -#include +#include "moc_plain-text-edit.cpp" #include OBSPlainTextEdit::OBSPlainTextEdit(QWidget *parent, bool monospace) diff --git a/shared/qt/slider-ignorewheel/slider-ignorewheel.cpp b/shared/qt/slider-ignorewheel/slider-ignorewheel.cpp index 69f595405..36d602a3f 100644 --- a/shared/qt/slider-ignorewheel/slider-ignorewheel.cpp +++ b/shared/qt/slider-ignorewheel/slider-ignorewheel.cpp @@ -1,4 +1,4 @@ -#include "slider-ignorewheel.hpp" +#include "moc_slider-ignorewheel.cpp" SliderIgnoreScroll::SliderIgnoreScroll(QWidget *parent) : QSlider(parent) { diff --git a/shared/qt/vertical-scroll-area/vertical-scroll-area.cpp b/shared/qt/vertical-scroll-area/vertical-scroll-area.cpp index 684c9c1be..ccfdc8f44 100644 --- a/shared/qt/vertical-scroll-area/vertical-scroll-area.cpp +++ b/shared/qt/vertical-scroll-area/vertical-scroll-area.cpp @@ -1,5 +1,5 @@ #include -#include "vertical-scroll-area.hpp" +#include "moc_vertical-scroll-area.cpp" void VScrollArea::resizeEvent(QResizeEvent *event) { diff --git a/shared/qt/wrappers/qt-wrappers.cpp b/shared/qt/wrappers/qt-wrappers.cpp index 7e016b0d7..f7cc449a1 100644 --- a/shared/qt/wrappers/qt-wrappers.cpp +++ b/shared/qt/wrappers/qt-wrappers.cpp @@ -15,7 +15,7 @@ along with this program. If not, see . ******************************************************************************/ -#include "qt-wrappers.hpp" +#include "moc_qt-wrappers.cpp" #include #include