automoc-patch.diff

diff --git a/Application.cpp b/Application.cpp
index 7fc0c33..f78223d 100644
--- a/Application.cpp
+++ b/Application.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "Application.h"
-#include "Application.h.moc"
 #include "OutOfMemoryHandler.h"
 #include <new>
 
diff --git a/BasicImageView.cpp b/BasicImageView.cpp
index d07cc8f..65a6893 100644
--- a/BasicImageView.cpp
+++ b/BasicImageView.cpp
@@ -16,7 +16,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "BasicImageView.h.moc"
 #include "ImageTransformation.h"
 #include "ImagePresentation.h"
 #include "Dpm.h"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a153693..7e9cc70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -562,7 +562,9 @@ SET(
 )
 
 SOURCE_GROUP("Sources" FILES ${common_sources} ${gui_only_sources} ${cli_only_sources})
-QT4_AUTOMOC(${sources} ${common_sources} ${gui_only_sources} ${cli_only_sources})
+# QT4_AUTOMOC(${sources} ${common_sources} ${gui_only_sources} ${cli_only_sources})
+SET(CMAKE_AUTOMOC TRUE)
+SET(AUTOMOC_MOC_OPTIONS "-DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION")
 
 SOURCE_GROUP("Special Headers" FILES version.h config.h.in)
 
diff --git a/ErrorWidget.cpp b/ErrorWidget.cpp
index 148c338..8b8c2f4 100644
--- a/ErrorWidget.cpp
+++ b/ErrorWidget.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "ErrorWidget.h"
-#include "ErrorWidget.h.moc"
 #include <QStyle>
 #include <QIcon>
 
diff --git a/FilterOptionsWidget.cpp b/FilterOptionsWidget.cpp
index d75c0a3..0d165ac 100644
--- a/FilterOptionsWidget.cpp
+++ b/FilterOptionsWidget.cpp
@@ -16,4 +16,3 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "FilterOptionsWidget.h.moc"
diff --git a/FixDpiDialog.cpp b/FixDpiDialog.cpp
index 731a873..0116e16 100644
--- a/FixDpiDialog.cpp
+++ b/FixDpiDialog.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "FixDpiDialog.h"
-#include "FixDpiDialog.h.moc"
 #include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
 #include <QModelIndex>
diff --git a/ImageViewBase.cpp b/ImageViewBase.cpp
index 211ec99..d15c097 100644
--- a/ImageViewBase.cpp
+++ b/ImageViewBase.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "ImageViewBase.h"
-#include "ImageViewBase.h.moc"
 #include "NonCopyable.h"
 #include "ImagePresentation.h"
 #include "OpenGLSupport.h"
diff --git a/MainWindow.cpp b/MainWindow.cpp
index 41d08d3..4d0e55a 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "MainWindow.h"
-#include "MainWindow.h.moc"
 #include "NewOpenProjectPanel.h"
 #include "RecentProjects.h"
 #include "WorkerThread.h"
diff --git a/NewOpenProjectPanel.cpp b/NewOpenProjectPanel.cpp
index 153ba19..49f70d1 100644
--- a/NewOpenProjectPanel.cpp
+++ b/NewOpenProjectPanel.cpp
@@ -16,7 +16,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "NewOpenProjectPanel.h.moc"
 #include "RecentProjects.h"
 #include "Utils.h"
 #include <boost/lambda/lambda.hpp>
diff --git a/OutOfMemoryDialog.cpp b/OutOfMemoryDialog.cpp
index abc1294..4800aa0 100644
--- a/OutOfMemoryDialog.cpp
+++ b/OutOfMemoryDialog.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "OutOfMemoryDialog.h"
-#include "OutOfMemoryDialog.h.moc"
 #include "ProjectWriter.h"
 #include "RecentProjects.h"
 #include <QFileDialog>
diff --git a/OutOfMemoryHandler.cpp b/OutOfMemoryHandler.cpp
index 9ea7f9b..6962149 100644
--- a/OutOfMemoryHandler.cpp
+++ b/OutOfMemoryHandler.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "OutOfMemoryHandler.h"
-#include "OutOfMemoryHandler.h.moc"
 #include <QMutexLocker>
 #include <QMetaObject>
 #include <Qt>
diff --git a/ProjectCreationContext.cpp b/ProjectCreationContext.cpp
index 4060902..0e3eb77 100644
--- a/ProjectCreationContext.cpp
+++ b/ProjectCreationContext.cpp
@@ -16,7 +16,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ProjectCreationContext.h.moc"
 #include "ProjectFilesDialog.h"
 #include "FixDpiDialog.h"
 #include "ImageFileInfo.h"
diff --git a/ProjectFilesDialog.cpp b/ProjectFilesDialog.cpp
index f632b3c..b66df16 100644
--- a/ProjectFilesDialog.cpp
+++ b/ProjectFilesDialog.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "ProjectFilesDialog.h"
-#include "ProjectFilesDialog.h.moc"
 #include "NonCopyable.h"
 #include "ImageMetadata.h"
 #include "ImageMetadataLoader.h"
diff --git a/ProjectOpeningContext.cpp b/ProjectOpeningContext.cpp
index 7f60f7e..3c761b0 100644
--- a/ProjectOpeningContext.cpp
+++ b/ProjectOpeningContext.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "ProjectOpeningContext.h"
-#include "ProjectOpeningContext.h.moc"
 #include "FixDpiDialog.h"
 #include "ProjectPages.h"
 #include <QString>
diff --git a/ProjectPages.cpp b/ProjectPages.cpp
index 700005a..a892de6 100644
--- a/ProjectPages.cpp
+++ b/ProjectPages.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "ProjectPages.h"
-#include "ProjectPages.h.moc"
 #include "ImageFileInfo.h"
 #include "ImageMetadata.h"
 #include "ImageInfo.h"
diff --git a/RelinkablePathVisualization.cpp b/RelinkablePathVisualization.cpp
index cacc42a..9929ffb 100644
--- a/RelinkablePathVisualization.cpp
+++ b/RelinkablePathVisualization.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "RelinkablePathVisualization.h"
-#include "RelinkablePathVisualization.h.moc"
 #include "RelinkablePath.h"
 #include "QtSignalForwarder.h"
 #include <QHBoxLayout>
diff --git a/RelinkingDialog.cpp b/RelinkingDialog.cpp
index 7c5b75e..9adc4fa 100644
--- a/RelinkingDialog.cpp
+++ b/RelinkingDialog.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "RelinkingDialog.h"
-#include "RelinkingDialog.h.moc"
 #include "RelinkingSortingModel.h"
 #include <QDir>
 #include <QFileDialog>
diff --git a/SettingsDialog.cpp b/SettingsDialog.cpp
index bad6152..4fad917 100644
--- a/SettingsDialog.cpp
+++ b/SettingsDialog.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "SettingsDialog.h"
-#include "SettingsDialog.h.moc"
 #include "OpenGLSupport.h"
 #include "config.h"
 #include <QSettings>
diff --git a/StageListView.cpp b/StageListView.cpp
index ba4ba9e..95baeeb 100644
--- a/StageListView.cpp
+++ b/StageListView.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "StageListView.h"
-#include "StageListView.h.moc"
 #include "StageSequence.h"
 #include "ChangedStateItemDelegate.h"
 #include "SkinnedButton.h"
diff --git a/SystemLoadWidget.cpp b/SystemLoadWidget.cpp
index 2ec4596..93d1ad0 100644
--- a/SystemLoadWidget.cpp
+++ b/SystemLoadWidget.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "SystemLoadWidget.h"
-#include "SystemLoadWidget.h.moc"
 #include "ThreadPriority.h"
 #include <QToolTip>
 
diff --git a/TabbedDebugImages.cpp b/TabbedDebugImages.cpp
index 828b3a3..cbf6f0b 100644
--- a/TabbedDebugImages.cpp
+++ b/TabbedDebugImages.cpp
@@ -16,7 +16,6 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "TabbedDebugImages.h.moc"
 #include "DebugImageView.h"
 
 TabbedDebugImages::TabbedDebugImages(QWidget* parent)
diff --git a/ThumbnailSequence.cpp b/ThumbnailSequence.cpp
index b94ad33..99aca92 100644
--- a/ThumbnailSequence.cpp
+++ b/ThumbnailSequence.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "ThumbnailSequence.h"
-#include "ThumbnailSequence.h.moc"
 #include "ThumbnailFactory.h"
 #include "IncompleteThumbnail.h"
 #include "PageSequence.h"
diff --git a/WorkerThread.cpp b/WorkerThread.cpp
index af11295..01a9b8e 100644
--- a/WorkerThread.cpp
+++ b/WorkerThread.cpp
@@ -16,7 +16,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "WorkerThread.h"
-#include "WorkerThread.h.moc"
 #include "ThreadPriority.h"
 #include "OutOfMemoryHandler.h"
 #include <QCoreApplication>