From 995da7bafc811f19fc855c5426a4ada9134721cd Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Thu, 18 May 2006 08:51:12 +0000
Subject: [PATCH] Qt4 compilation speedup patch by Bo Peng and me.

* configure.ac: removed frontends/qt4/moc compilation.
* frontends/qt4/: moc files (*_moc.cpp) are now included at the end of relevant source file (*.C)
* SConscript: adapted to "moc included in .C file" change.
* frontends/qt4/Makefile.am:  adapted to "moc included in .C file" change.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13860 a592a061-630c-0410-9148-cb99ea01b6c8
---
 configure.ac                             |  1 -
 development/scons/SConscript             |  4 ++--
 src/frontends/qt4/BulletsModule.C        |  2 ++
 src/frontends/qt4/FileDialog_private.C   |  2 ++
 src/frontends/qt4/Makefile.am            | 15 ++++++++++---
 src/frontends/qt4/QAboutDialog.C         |  2 ++
 src/frontends/qt4/QBibitemDialog.C       |  2 ++
 src/frontends/qt4/QBibtexDialog.C        |  2 ++
 src/frontends/qt4/QBoxDialog.C           |  2 ++
 src/frontends/qt4/QBranchDialog.C        |  2 ++
 src/frontends/qt4/QBranches.C            |  2 ++
 src/frontends/qt4/QChangesDialog.C       |  2 ++
 src/frontends/qt4/QCharacterDialog.C     |  2 ++
 src/frontends/qt4/QCitationDialog.C      |  2 ++
 src/frontends/qt4/QCommandBuffer.C       |  2 ++
 src/frontends/qt4/QCommandEdit.C         |  2 ++
 src/frontends/qt4/QDelimiterDialog.C     |  2 ++
 src/frontends/qt4/QDialogView.C          |  2 ++
 src/frontends/qt4/QDocumentDialog.C      |  2 ++
 src/frontends/qt4/QERTDialog.C           |  2 ++
 src/frontends/qt4/QErrorListDialog.C     |  2 ++
 src/frontends/qt4/QExternalDialog.C      |  2 ++
 src/frontends/qt4/QFloatDialog.C         |  2 ++
 src/frontends/qt4/QGraphicsDialog.C      |  2 ++
 src/frontends/qt4/QIncludeDialog.C       |  2 ++
 src/frontends/qt4/QIndexDialog.C         |  2 ++
 src/frontends/qt4/QLAction.C             |  2 ++
 src/frontends/qt4/QLMenubar.C            |  2 ++
 src/frontends/qt4/QLPopupMenu.C          |  2 ++
 src/frontends/qt4/QLPrintDialog.C        |  2 ++
 src/frontends/qt4/QLToolbar.C            |  2 ++
 src/frontends/qt4/QLogDialog.C           |  2 ++
 src/frontends/qt4/QMathDialog.C          |  2 ++
 src/frontends/qt4/QMathMatrixDialog.C    |  2 ++
 src/frontends/qt4/QNoteDialog.C          |  2 ++
 src/frontends/qt4/QParagraphDialog.C     |  2 ++
 src/frontends/qt4/QPrefsDialog.C         |  2 ++
 src/frontends/qt4/QRefDialog.C           |  2 ++
 src/frontends/qt4/QSearchDialog.C        |  2 ++
 src/frontends/qt4/QSendtoDialog.C        |  2 ++
 src/frontends/qt4/QShowFileDialog.C      |  2 ++
 src/frontends/qt4/QSpellcheckerDialog.C  |  2 ++
 src/frontends/qt4/QTabularCreateDialog.C |  2 ++
 src/frontends/qt4/QTabularDialog.C       |  2 ++
 src/frontends/qt4/QTexinfoDialog.C       |  2 ++
 src/frontends/qt4/QThesaurusDialog.C     |  2 ++
 src/frontends/qt4/QTocDialog.C           |  2 ++
 src/frontends/qt4/QURLDialog.C           |  2 ++
 src/frontends/qt4/QVSpaceDialog.C        |  2 ++
 src/frontends/qt4/QViewSource.C          |  2 ++
 src/frontends/qt4/QViewSourceDialog.C    |  2 ++
 src/frontends/qt4/QWorkArea.C            |  2 ++
 src/frontends/qt4/QWrapDialog.C          |  2 ++
 src/frontends/qt4/QtView.C               |  2 ++
 src/frontends/qt4/TocModel.C             |  2 ++
 src/frontends/qt4/emptytable.C           |  2 ++
 src/frontends/qt4/floatplacement.C       |  2 ++
 src/frontends/qt4/iconpalette.C          |  2 ++
 src/frontends/qt4/lengthcombo.C          |  2 ++
 src/frontends/qt4/moc/Makefile.am        | 28 ------------------------
 src/frontends/qt4/moc/pch.h              | 27 -----------------------
 src/frontends/qt4/panelstack.C           |  2 ++
 src/frontends/qt4/qsetborder.C           |  2 ++
 src/frontends/qt4/socket_callback.C      |  2 ++
 src/frontends/qt4/validators.C           |  2 ++
 65 files changed, 134 insertions(+), 61 deletions(-)
 delete mode 100644 src/frontends/qt4/moc/Makefile.am
 delete mode 100644 src/frontends/qt4/moc/pch.h

diff --git a/configure.ac b/configure.ac
index 9cb3675efc..e6edf89630 100644
--- a/configure.ac
+++ b/configure.ac
@@ -455,7 +455,6 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        src/frontends/qt3/ui/Makefile \
        src/frontends/qt3/ui/moc/Makefile \
        src/frontends/qt4/Makefile \
-       src/frontends/qt4/moc/Makefile \
        src/frontends/qt4/ui/Makefile \
 ])
 
diff --git a/development/scons/SConscript b/development/scons/SConscript
index 195a63b671..5fce12148b 100644
--- a/development/scons/SConscript
+++ b/development/scons/SConscript
@@ -879,7 +879,7 @@ elif frontend == 'qt4':
   resources = [qt4env.Uic4(x) for x in qt4_ui_files]
 
   # 
-  # moc qt4_moc_files
+  # moc qt4_moc_files, the moced files are included in the original files
   #
   qt4_moced_files = [qt4env.Moc4(x.replace('.C', '_moc.cpp'), x.replace('.C', '.h')) for x in qt4_moc_files]
 
@@ -888,7 +888,7 @@ elif frontend == 'qt4':
   qt4 = qt4env.StaticLibrary(
     target = '$LOCALLIBPATH/qt4',
     LIBS = qt4env['QT_LIB'],
-    source = qt4_source_files + qt4_moc_files + Flatten(qt4_moced_files)
+    source = qt4_source_files + qt4_moc_files
   )
   Alias('qt4', qt4)
 
diff --git a/src/frontends/qt4/BulletsModule.C b/src/frontends/qt4/BulletsModule.C
index 04a734f4ab..a23d3934e0 100644
--- a/src/frontends/qt4/BulletsModule.C
+++ b/src/frontends/qt4/BulletsModule.C
@@ -358,3 +358,5 @@ void BulletsModule::setCustom()
 	tmpbullet.setText(fromqstr(text));
 	tmpbullet.setFont(-1);
 }
+
+#include "BulletsModule_moc.cpp"
diff --git a/src/frontends/qt4/FileDialog_private.C b/src/frontends/qt4/FileDialog_private.C
index ff851c309d..32eb8f3581 100644
--- a/src/frontends/qt4/FileDialog_private.C
+++ b/src/frontends/qt4/FileDialog_private.C
@@ -81,3 +81,5 @@ void LyXFileDialog::buttonClicked()
 	else if (sender() == b2_)
 		setDir(toqstr(b2_dir_));
 }
+
+#include "FileDialog_private_moc.cpp"
diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index e9cde4a515..2dabd434ca 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -1,16 +1,25 @@
 include $(top_srcdir)/config/common.am
 include $(srcdir)/Makefile.dialogs
 
-SUBDIRS = ui moc
+DISTCLEANFILES += *_moc.cpp
+
+libqt4_la_DEPENDENCIES = $(MOCEDFILES)
+
+MOCEDFILES = $(MOCFILES:.C=_moc.cpp)
+
+%_moc.cpp: %.h
+	$(MOC4) -o $@ $<
+
+SUBDIRS = ui
 
 EXTRA_DIST = pch.h Makefile.dialogs
 
-BUILT_SOURCES = $(PCH_FILE)
+BUILT_SOURCES = $(PCH_FILE) $(MOCEDFILES)
 
 noinst_LTLIBRARIES = libqt4.la
 
 libqt4_la_LDFLAGS = $(QT4_LDFLAGS)
-libqt4_la_LIBADD = $(QT4_LIB) moc/*.lo 
+libqt4_la_LIBADD = $(QT4_LIB) 
 AM_CPPFLAGS += \
 	$(QT4_CPPFLAGS) \
 	$(PCH_FLAGS) \
diff --git a/src/frontends/qt4/QAboutDialog.C b/src/frontends/qt4/QAboutDialog.C
index 919963a3d8..81d364d970 100644
--- a/src/frontends/qt4/QAboutDialog.C
+++ b/src/frontends/qt4/QAboutDialog.C
@@ -30,3 +30,5 @@ QAboutDialog::~QAboutDialog()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QAboutDialog_moc.cpp"
diff --git a/src/frontends/qt4/QBibitemDialog.C b/src/frontends/qt4/QBibitemDialog.C
index 547fa53540..9ef306f1ad 100644
--- a/src/frontends/qt4/QBibitemDialog.C
+++ b/src/frontends/qt4/QBibitemDialog.C
@@ -47,3 +47,5 @@ void QBibitemDialog::closeEvent(QCloseEvent *e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QBibitemDialog_moc.cpp"
diff --git a/src/frontends/qt4/QBibtexDialog.C b/src/frontends/qt4/QBibtexDialog.C
index 0fe64e3b71..3fa3875617 100644
--- a/src/frontends/qt4/QBibtexDialog.C
+++ b/src/frontends/qt4/QBibtexDialog.C
@@ -232,3 +232,5 @@ void QBibtexDialog::closeEvent(QCloseEvent *e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QBibtexDialog_moc.cpp"
diff --git a/src/frontends/qt4/QBoxDialog.C b/src/frontends/qt4/QBoxDialog.C
index 4b7f5b672a..22643dc171 100644
--- a/src/frontends/qt4/QBoxDialog.C
+++ b/src/frontends/qt4/QBoxDialog.C
@@ -111,3 +111,5 @@ void QBoxDialog::restoreClicked()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QBoxDialog_moc.cpp"
diff --git a/src/frontends/qt4/QBranchDialog.C b/src/frontends/qt4/QBranchDialog.C
index 02c5b7fa92..b4e0725536 100644
--- a/src/frontends/qt4/QBranchDialog.C
+++ b/src/frontends/qt4/QBranchDialog.C
@@ -46,3 +46,5 @@ void QBranchDialog::change_adaptor()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QBranchDialog_moc.cpp"
diff --git a/src/frontends/qt4/QBranches.C b/src/frontends/qt4/QBranches.C
index 221ae45ca3..a34be4144b 100644
--- a/src/frontends/qt4/QBranches.C
+++ b/src/frontends/qt4/QBranches.C
@@ -176,3 +176,5 @@ void QBranches::on_colorPB_clicked()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QBranches_moc.cpp"
diff --git a/src/frontends/qt4/QChangesDialog.C b/src/frontends/qt4/QChangesDialog.C
index 239a955007..25ee375af0 100644
--- a/src/frontends/qt4/QChangesDialog.C
+++ b/src/frontends/qt4/QChangesDialog.C
@@ -60,3 +60,5 @@ void QChangesDialog::closeEvent(QCloseEvent *e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QChangesDialog_moc.cpp"
diff --git a/src/frontends/qt4/QCharacterDialog.C b/src/frontends/qt4/QCharacterDialog.C
index 0899c63979..f461c7f7f0 100644
--- a/src/frontends/qt4/QCharacterDialog.C
+++ b/src/frontends/qt4/QCharacterDialog.C
@@ -72,3 +72,5 @@ void QCharacterDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QCharacterDialog_moc.cpp"
diff --git a/src/frontends/qt4/QCitationDialog.C b/src/frontends/qt4/QCitationDialog.C
index 68960ceff0..fcd2214d6f 100644
--- a/src/frontends/qt4/QCitationDialog.C
+++ b/src/frontends/qt4/QCitationDialog.C
@@ -466,3 +466,5 @@ void QCitationFind::find(biblio::Direction dir)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QCitationDialog_moc.cpp"
diff --git a/src/frontends/qt4/QCommandBuffer.C b/src/frontends/qt4/QCommandBuffer.C
index aea7f31a5c..43e89a30e7 100644
--- a/src/frontends/qt4/QCommandBuffer.C
+++ b/src/frontends/qt4/QCommandBuffer.C
@@ -232,3 +232,5 @@ void XMiniBuffer::suffix_timeout()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QCommandBuffer_moc.cpp"
diff --git a/src/frontends/qt4/QCommandEdit.C b/src/frontends/qt4/QCommandEdit.C
index 80cc49e578..dd786e6072 100644
--- a/src/frontends/qt4/QCommandEdit.C
+++ b/src/frontends/qt4/QCommandEdit.C
@@ -63,3 +63,5 @@ bool QCommandEdit::event(QEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QCommandEdit_moc.cpp"
diff --git a/src/frontends/qt4/QDelimiterDialog.C b/src/frontends/qt4/QDelimiterDialog.C
index e78c4b2fc5..8ba79ba5cc 100644
--- a/src/frontends/qt4/QDelimiterDialog.C
+++ b/src/frontends/qt4/QDelimiterDialog.C
@@ -145,3 +145,5 @@ void QDelimiterDialog::rdelim_clicked(const string & str)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QDelimiterDialog_moc.cpp"
diff --git a/src/frontends/qt4/QDialogView.C b/src/frontends/qt4/QDialogView.C
index 6251a689ad..8d92cc94d1 100644
--- a/src/frontends/qt4/QDialogView.C
+++ b/src/frontends/qt4/QDialogView.C
@@ -116,3 +116,5 @@ void QDialogView::slotRestore()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QDialogView_moc.cpp"
diff --git a/src/frontends/qt4/QDocumentDialog.C b/src/frontends/qt4/QDocumentDialog.C
index 187849c0aa..61a8edf3c7 100644
--- a/src/frontends/qt4/QDocumentDialog.C
+++ b/src/frontends/qt4/QDocumentDialog.C
@@ -1035,3 +1035,5 @@ void QDocumentDialog::update(BufferParams const & params)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QDocumentDialog_moc.cpp"
diff --git a/src/frontends/qt4/QERTDialog.C b/src/frontends/qt4/QERTDialog.C
index fb95efaaa8..9d4f5fa655 100644
--- a/src/frontends/qt4/QERTDialog.C
+++ b/src/frontends/qt4/QERTDialog.C
@@ -49,3 +49,5 @@ void QERTDialog::change_adaptor()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QERTDialog_moc.cpp"
diff --git a/src/frontends/qt4/QErrorListDialog.C b/src/frontends/qt4/QErrorListDialog.C
index 6392fab2d8..205d257e12 100644
--- a/src/frontends/qt4/QErrorListDialog.C
+++ b/src/frontends/qt4/QErrorListDialog.C
@@ -51,3 +51,5 @@ void QErrorListDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QErrorListDialog_moc.cpp"
diff --git a/src/frontends/qt4/QExternalDialog.C b/src/frontends/qt4/QExternalDialog.C
index 15bd83bbf9..9f4debec7d 100644
--- a/src/frontends/qt4/QExternalDialog.C
+++ b/src/frontends/qt4/QExternalDialog.C
@@ -224,3 +224,5 @@ void QExternalDialog::widthUnitChanged()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QExternalDialog_moc.cpp"
diff --git a/src/frontends/qt4/QFloatDialog.C b/src/frontends/qt4/QFloatDialog.C
index f450480254..84c24f81fc 100644
--- a/src/frontends/qt4/QFloatDialog.C
+++ b/src/frontends/qt4/QFloatDialog.C
@@ -60,3 +60,5 @@ void QFloatDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QFloatDialog_moc.cpp"
diff --git a/src/frontends/qt4/QGraphicsDialog.C b/src/frontends/qt4/QGraphicsDialog.C
index ab06db9465..fa55cecad2 100644
--- a/src/frontends/qt4/QGraphicsDialog.C
+++ b/src/frontends/qt4/QGraphicsDialog.C
@@ -165,3 +165,5 @@ void QGraphicsDialog::filenameChanged(const QString & filename)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QGraphicsDialog_moc.cpp"
diff --git a/src/frontends/qt4/QIncludeDialog.C b/src/frontends/qt4/QIncludeDialog.C
index 989ea4ae7b..6fbebe6e10 100644
--- a/src/frontends/qt4/QIncludeDialog.C
+++ b/src/frontends/qt4/QIncludeDialog.C
@@ -103,3 +103,5 @@ void QIncludeDialog::browseClicked()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QIncludeDialog_moc.cpp"
diff --git a/src/frontends/qt4/QIndexDialog.C b/src/frontends/qt4/QIndexDialog.C
index 78487601cf..1ab740cda1 100644
--- a/src/frontends/qt4/QIndexDialog.C
+++ b/src/frontends/qt4/QIndexDialog.C
@@ -80,3 +80,5 @@ void QIndexDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QIndexDialog_moc.cpp"
diff --git a/src/frontends/qt4/QLAction.C b/src/frontends/qt4/QLAction.C
index dffe69f170..56ccdf45a5 100644
--- a/src/frontends/qt4/QLAction.C
+++ b/src/frontends/qt4/QLAction.C
@@ -87,3 +87,5 @@ void QLAction::action()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QLAction_moc.cpp"
diff --git a/src/frontends/qt4/QLMenubar.C b/src/frontends/qt4/QLMenubar.C
index 64e2f1f30e..846feed714 100644
--- a/src/frontends/qt4/QLMenubar.C
+++ b/src/frontends/qt4/QLMenubar.C
@@ -171,3 +171,5 @@ void QLMenubar::macxMenuBarInit()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QLMenubar_moc.cpp"
diff --git a/src/frontends/qt4/QLPopupMenu.C b/src/frontends/qt4/QLPopupMenu.C
index 892e6b0103..3e105f38f9 100644
--- a/src/frontends/qt4/QLPopupMenu.C
+++ b/src/frontends/qt4/QLPopupMenu.C
@@ -200,3 +200,5 @@ void QLPopupMenu::specialMacXmenuHack()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QLPopupMenu_moc.cpp"
diff --git a/src/frontends/qt4/QLPrintDialog.C b/src/frontends/qt4/QLPrintDialog.C
index 79d728afb5..873a16264b 100644
--- a/src/frontends/qt4/QLPrintDialog.C
+++ b/src/frontends/qt4/QLPrintDialog.C
@@ -97,3 +97,5 @@ void QLPrintDialog::pagerangeChanged()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QLPrintDialog_moc.cpp"
diff --git a/src/frontends/qt4/QLToolbar.C b/src/frontends/qt4/QLToolbar.C
index 03003ed940..2a24e35c45 100644
--- a/src/frontends/qt4/QLToolbar.C
+++ b/src/frontends/qt4/QLToolbar.C
@@ -270,3 +270,5 @@ void QLToolbar::update()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QLToolbar_moc.cpp"
diff --git a/src/frontends/qt4/QLogDialog.C b/src/frontends/qt4/QLogDialog.C
index 0afbc818ab..6367d6b890 100644
--- a/src/frontends/qt4/QLogDialog.C
+++ b/src/frontends/qt4/QLogDialog.C
@@ -46,3 +46,5 @@ void QLogDialog::updateClicked()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QLogDialog_moc.cpp"
diff --git a/src/frontends/qt4/QMathDialog.C b/src/frontends/qt4/QMathDialog.C
index 26c9a0cc2a..f03157402b 100644
--- a/src/frontends/qt4/QMathDialog.C
+++ b/src/frontends/qt4/QMathDialog.C
@@ -261,3 +261,5 @@ void QMathDialog::insertCubeRoot()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QMathDialog_moc.cpp"
diff --git a/src/frontends/qt4/QMathMatrixDialog.C b/src/frontends/qt4/QMathMatrixDialog.C
index b02a26a560..c178782409 100644
--- a/src/frontends/qt4/QMathMatrixDialog.C
+++ b/src/frontends/qt4/QMathMatrixDialog.C
@@ -113,3 +113,5 @@ void QMathMatrixDialog::slotClose()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QMathMatrixDialog_moc.cpp"
diff --git a/src/frontends/qt4/QNoteDialog.C b/src/frontends/qt4/QNoteDialog.C
index 15f9e75802..948afceaee 100644
--- a/src/frontends/qt4/QNoteDialog.C
+++ b/src/frontends/qt4/QNoteDialog.C
@@ -50,3 +50,5 @@ void QNoteDialog::change_adaptor()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QNoteDialog_moc.cpp"
diff --git a/src/frontends/qt4/QParagraphDialog.C b/src/frontends/qt4/QParagraphDialog.C
index 330e08c69e..9284c93f22 100644
--- a/src/frontends/qt4/QParagraphDialog.C
+++ b/src/frontends/qt4/QParagraphDialog.C
@@ -86,3 +86,5 @@ void QParagraphDialog::enableLinespacingValue(int)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QParagraphDialog_moc.cpp"
diff --git a/src/frontends/qt4/QPrefsDialog.C b/src/frontends/qt4/QPrefsDialog.C
index 5d147b80f3..23c849598c 100644
--- a/src/frontends/qt4/QPrefsDialog.C
+++ b/src/frontends/qt4/QPrefsDialog.C
@@ -1605,3 +1605,5 @@ void QPrefsDialog::update(LyXRC const & rc)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QPrefsDialog_moc.cpp"
diff --git a/src/frontends/qt4/QRefDialog.C b/src/frontends/qt4/QRefDialog.C
index d9537c2de4..0427198b8c 100644
--- a/src/frontends/qt4/QRefDialog.C
+++ b/src/frontends/qt4/QRefDialog.C
@@ -135,3 +135,5 @@ void QRefDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QRefDialog_moc.cpp"
diff --git a/src/frontends/qt4/QSearchDialog.C b/src/frontends/qt4/QSearchDialog.C
index 2e561a05a7..6586f1b2ba 100644
--- a/src/frontends/qt4/QSearchDialog.C
+++ b/src/frontends/qt4/QSearchDialog.C
@@ -123,3 +123,5 @@ void QSearchDialog::replaceallClicked()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QSearchDialog_moc.cpp"
diff --git a/src/frontends/qt4/QSendtoDialog.C b/src/frontends/qt4/QSendtoDialog.C
index 82b4f44033..fabe956b09 100644
--- a/src/frontends/qt4/QSendtoDialog.C
+++ b/src/frontends/qt4/QSendtoDialog.C
@@ -57,3 +57,5 @@ void QSendtoDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QSendtoDialog_moc.cpp"
diff --git a/src/frontends/qt4/QShowFileDialog.C b/src/frontends/qt4/QShowFileDialog.C
index 31a8d0705e..89e600c45b 100644
--- a/src/frontends/qt4/QShowFileDialog.C
+++ b/src/frontends/qt4/QShowFileDialog.C
@@ -37,3 +37,5 @@ void QShowFileDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QShowFileDialog_moc.cpp"
diff --git a/src/frontends/qt4/QSpellcheckerDialog.C b/src/frontends/qt4/QSpellcheckerDialog.C
index e831875cf0..015103006b 100644
--- a/src/frontends/qt4/QSpellcheckerDialog.C
+++ b/src/frontends/qt4/QSpellcheckerDialog.C
@@ -106,3 +106,5 @@ void QSpellcheckerDialog::reject()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QSpellcheckerDialog_moc.cpp"
diff --git a/src/frontends/qt4/QTabularCreateDialog.C b/src/frontends/qt4/QTabularCreateDialog.C
index 0626a99ce9..173581f9a7 100644
--- a/src/frontends/qt4/QTabularCreateDialog.C
+++ b/src/frontends/qt4/QTabularCreateDialog.C
@@ -57,3 +57,5 @@ void QTabularCreateDialog::rowsChanged(int)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QTabularCreateDialog_moc.cpp"
diff --git a/src/frontends/qt4/QTabularDialog.C b/src/frontends/qt4/QTabularDialog.C
index 1c4ef53a4b..822dc75553 100644
--- a/src/frontends/qt4/QTabularDialog.C
+++ b/src/frontends/qt4/QTabularDialog.C
@@ -383,3 +383,5 @@ void QTabularDialog::ltLastFooterEmpty_clicked()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QTabularDialog_moc.cpp"
diff --git a/src/frontends/qt4/QTexinfoDialog.C b/src/frontends/qt4/QTexinfoDialog.C
index d5cd63972e..decb8a48f0 100644
--- a/src/frontends/qt4/QTexinfoDialog.C
+++ b/src/frontends/qt4/QTexinfoDialog.C
@@ -104,3 +104,5 @@ void QTexinfoDialog::enableViewPB()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QTexinfoDialog_moc.cpp"
diff --git a/src/frontends/qt4/QThesaurusDialog.C b/src/frontends/qt4/QThesaurusDialog.C
index c24487325a..064a189bb2 100644
--- a/src/frontends/qt4/QThesaurusDialog.C
+++ b/src/frontends/qt4/QThesaurusDialog.C
@@ -133,3 +133,5 @@ void QThesaurusDialog::updateLists()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QThesaurusDialog_moc.cpp"
diff --git a/src/frontends/qt4/QTocDialog.C b/src/frontends/qt4/QTocDialog.C
index 4a155bdfce..2e15f12c28 100644
--- a/src/frontends/qt4/QTocDialog.C
+++ b/src/frontends/qt4/QTocDialog.C
@@ -239,3 +239,5 @@ bool QTocDialog::isVisible() const
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QTocDialog_moc.cpp"
diff --git a/src/frontends/qt4/QURLDialog.C b/src/frontends/qt4/QURLDialog.C
index 665b046b36..8b355817ec 100644
--- a/src/frontends/qt4/QURLDialog.C
+++ b/src/frontends/qt4/QURLDialog.C
@@ -62,3 +62,5 @@ void QURLDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QURLDialog_moc.cpp"
diff --git a/src/frontends/qt4/QVSpaceDialog.C b/src/frontends/qt4/QVSpaceDialog.C
index 8f63f762fe..1187c41c8c 100644
--- a/src/frontends/qt4/QVSpaceDialog.C
+++ b/src/frontends/qt4/QVSpaceDialog.C
@@ -74,3 +74,5 @@ void QVSpaceDialog::enableCustom(int selection)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QVSpaceDialog_moc.cpp"
diff --git a/src/frontends/qt4/QViewSource.C b/src/frontends/qt4/QViewSource.C
index f492e67854..b3ce191523 100644
--- a/src/frontends/qt4/QViewSource.C
+++ b/src/frontends/qt4/QViewSource.C
@@ -108,3 +108,5 @@ void QViewSource::update_contents()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QViewSource_moc.cpp"
diff --git a/src/frontends/qt4/QViewSourceDialog.C b/src/frontends/qt4/QViewSourceDialog.C
index 5ddd43fb26..227aa9e96d 100644
--- a/src/frontends/qt4/QViewSourceDialog.C
+++ b/src/frontends/qt4/QViewSourceDialog.C
@@ -38,3 +38,5 @@ void QViewSourceDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QViewSourceDialog_moc.cpp"
diff --git a/src/frontends/qt4/QWorkArea.C b/src/frontends/qt4/QWorkArea.C
index ec92b42510..6693c5f28c 100644
--- a/src/frontends/qt4/QWorkArea.C
+++ b/src/frontends/qt4/QWorkArea.C
@@ -671,3 +671,5 @@ pascal OSErr handleOpenDocuments(const AppleEvent* inEvent,
 	return err;
 }
 #endif  // Q_WS_MACX
+
+#include "QWorkArea_moc.cpp"
diff --git a/src/frontends/qt4/QWrapDialog.C b/src/frontends/qt4/QWrapDialog.C
index ab0fdfada7..eb40d2f563 100644
--- a/src/frontends/qt4/QWrapDialog.C
+++ b/src/frontends/qt4/QWrapDialog.C
@@ -55,3 +55,5 @@ void QWrapDialog::change_adaptor()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QWrapDialog_moc.cpp"
diff --git a/src/frontends/qt4/QtView.C b/src/frontends/qt4/QtView.C
index 782781b9fe..c79383356a 100644
--- a/src/frontends/qt4/QtView.C
+++ b/src/frontends/qt4/QtView.C
@@ -209,3 +209,5 @@ void QtView::busy(bool yes) const
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QtView_moc.cpp"
diff --git a/src/frontends/qt4/TocModel.C b/src/frontends/qt4/TocModel.C
index a97eba44cc..7363dc9951 100644
--- a/src/frontends/qt4/TocModel.C
+++ b/src/frontends/qt4/TocModel.C
@@ -151,3 +151,5 @@ void TocModel::populate(TocIterator & iter,
 
 } // namespace frontend
 } // namespace lyx
+
+#include "TocModel_moc.cpp"
diff --git a/src/frontends/qt4/emptytable.C b/src/frontends/qt4/emptytable.C
index 8b913d17d1..888d288c93 100644
--- a/src/frontends/qt4/emptytable.C
+++ b/src/frontends/qt4/emptytable.C
@@ -110,3 +110,5 @@ void EmptyTable::mouseMoveEvent(QMouseEvent *ev)
 		setNumberRows(y / cellsize + rowCount()-1);
 }
 */
+
+#include "emptytable_moc.cpp"
diff --git a/src/frontends/qt4/floatplacement.C b/src/frontends/qt4/floatplacement.C
index f09bee192e..54fba48b8e 100644
--- a/src/frontends/qt4/floatplacement.C
+++ b/src/frontends/qt4/floatplacement.C
@@ -277,3 +277,5 @@ void FloatPlacement::checkAllowed()
 		heredefinitelyCB->setEnabled(!defaults);
 	}
 }
+
+#include "floatplacement_moc.cpp"
diff --git a/src/frontends/qt4/iconpalette.C b/src/frontends/qt4/iconpalette.C
index f912e5674b..6766c5e85e 100644
--- a/src/frontends/qt4/iconpalette.C
+++ b/src/frontends/qt4/iconpalette.C
@@ -120,3 +120,5 @@ out:
 	setUpdatesEnabled(true);
 	update();
 }
+
+#include "iconpalette_moc.cpp"
diff --git a/src/frontends/qt4/lengthcombo.C b/src/frontends/qt4/lengthcombo.C
index c65b63dbbf..2d681fb9c8 100644
--- a/src/frontends/qt4/lengthcombo.C
+++ b/src/frontends/qt4/lengthcombo.C
@@ -77,3 +77,5 @@ void LengthCombo::noPercents()
 		}
 	}
 }
+
+#include "lengthcombo_moc.cpp"
diff --git a/src/frontends/qt4/moc/Makefile.am b/src/frontends/qt4/moc/Makefile.am
deleted file mode 100644
index ac16156f34..0000000000
--- a/src/frontends/qt4/moc/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-include $(top_srcdir)/config/common.am
-include $(srcdir)/../Makefile.dialogs
-
-DISTCLEANFILES += *.C
-
-EXTRA_DIST = pch.h
-
-BUILT_SOURCES = $(PCH_FILE)
-
-AM_CPPFLAGS += \
-	$(QT4_CPPFLAGS) -DQT_NO_TRANSLATION \
-	$(PCH_FLAGS) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/frontends \
-	-I$(top_srcdir)/src/frontends/controllers \
-	-I$(top_srcdir)/src/frontends/qt4 \
-	-I$(top_builddir)/src/frontends/qt4 \
-	$(QT4_INCLUDES) \
-	$(BOOST_INCLUDES)
-
-noinst_LTLIBRARIES = libqt4moc.la
-
-nodist_libqt4moc_la_SOURCES = $(MOCFILES:.C=_moc.C)
-# The trick.
-libqt4moc_la_LINK = touch libqt4moc.la ; echo
-
-%_moc.C: $(srcdir)/../%.h
-	$(MOC4) -o $@ $<
diff --git a/src/frontends/qt4/moc/pch.h b/src/frontends/qt4/moc/pch.h
deleted file mode 100644
index 0eda1f7a14..0000000000
--- a/src/frontends/qt4/moc/pch.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- C++ -*-
-
-#include <config.h>
-
-#include <boost/array.hpp>
-#include <boost/assert.hpp>
-#include <boost/function.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/signals/trackable.hpp>
-#include <boost/signal.hpp>
-#include <boost/tuple/tuple.hpp>
-#include <boost/utility.hpp>
-
-#include <algorithm>
-#include <cmath>
-#include <iomanip>
-#include <map>
-#include <sstream>
-#include <stack>
-#include <string>
-#include <utility>
-#include <vector>
-
-// Have I said anything about the braindeadness of QT lately?
-// Just to remind you: signals slot emit as macros, pure lunacy!
-// So we are not able to have any qt headers in the pch.
diff --git a/src/frontends/qt4/panelstack.C b/src/frontends/qt4/panelstack.C
index 393b8946c5..d0d22907f9 100644
--- a/src/frontends/qt4/panelstack.C
+++ b/src/frontends/qt4/panelstack.C
@@ -132,3 +132,5 @@ void PanelStack::switchPanel(QTreeWidgetItem * item, QTreeWidgetItem* previous)
 
 	stack_->setCurrentWidget(cit->second);
 }
+
+#include "panelstack_moc.cpp"
diff --git a/src/frontends/qt4/qsetborder.C b/src/frontends/qt4/qsetborder.C
index acc001e664..542ca8e43e 100644
--- a/src/frontends/qt4/qsetborder.C
+++ b/src/frontends/qt4/qsetborder.C
@@ -234,3 +234,5 @@ bool QSetBorder::getBottom()
 {
 	return bottom_.set;
 }
+
+#include "qsetborder_moc.cpp"
diff --git a/src/frontends/qt4/socket_callback.C b/src/frontends/qt4/socket_callback.C
index 89d684c0a8..43fa05e7b8 100644
--- a/src/frontends/qt4/socket_callback.C
+++ b/src/frontends/qt4/socket_callback.C
@@ -27,3 +27,5 @@ void socket_callback::data_received()
 {
 	func_();
 }
+
+#include "socket_callback_moc.cpp"
diff --git a/src/frontends/qt4/validators.C b/src/frontends/qt4/validators.C
index deef5be716..2de6e5df00 100644
--- a/src/frontends/qt4/validators.C
+++ b/src/frontends/qt4/validators.C
@@ -167,3 +167,5 @@ PathValidator * getPathValidator(QLineEdit * ed)
 		return 0;
 	return dynamic_cast<PathValidator *>(validator);
 }
+
+#include "validators_moc.cpp"
-- 
2.39.2