From beef99ce58952b9ffbd49c0534709b80210c9e11 Mon Sep 17 00:00:00 2001
From: mgubi <mgubi@64cb5145-927a-446d-8aed-2fb7b4773692>
Date: Thu, 23 Oct 2008 10:40:01 +0000
Subject: [PATCH] Handling of moc files is now compatible with qmake

git-svn-id: svn://svn.savannah.gnu.org/texmacs/trunk@2397 64cb5145-927a-446d-8aed-2fb7b4773692
---
 src/src/Plugins/Qt/QTMStyle.cpp  | 1 -
 src/src/Plugins/Qt/QTMWidget.cpp | 1 -
 src/src/Plugins/Qt/qt_gui.cpp    | 2 --
 src/src/Plugins/Qt/qt_menu.cpp   | 2 --
 src/src/Plugins/Qt/qt_widget.cpp | 2 --
 src/src/makefile.in              | 6 +++---
 6 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/src/Plugins/Qt/QTMStyle.cpp b/src/src/Plugins/Qt/QTMStyle.cpp
index b59de5df..da9af816 100644
--- a/src/src/Plugins/Qt/QTMStyle.cpp
+++ b/src/src/Plugins/Qt/QTMStyle.cpp
@@ -14,7 +14,6 @@
 #include <QApplication>
 #include <QStyleOptionMenuItem>
 #include <iostream>
-#include "QTMStyle.moc"
 
 /******************************************************************************
 * QTMProxyStyle (does not own *style)
diff --git a/src/src/Plugins/Qt/QTMWidget.cpp b/src/src/Plugins/Qt/QTMWidget.cpp
index 440d4494..473fe64b 100644
--- a/src/src/Plugins/Qt/QTMWidget.cpp
+++ b/src/src/Plugins/Qt/QTMWidget.cpp
@@ -12,7 +12,6 @@
 
 #include <QtGui>
 #include "QTMWidget.hpp"
-#include "QTMWidget.moc"
 #include "qt_renderer.hpp"
 #include "converter.hpp"
 
diff --git a/src/src/Plugins/Qt/qt_gui.cpp b/src/src/Plugins/Qt/qt_gui.cpp
index ba0e5e3f..13469c19 100755
--- a/src/src/Plugins/Qt/qt_gui.cpp
+++ b/src/src/Plugins/Qt/qt_gui.cpp
@@ -426,8 +426,6 @@ qt_gui_rep::update () {
   interrupted = false;
 }
 
-#include "QTMGuiHelper.moc"
-
 void
 QTMGuiHelper::doUpdate() { 
   gui->update(); 
diff --git a/src/src/Plugins/Qt/qt_menu.cpp b/src/src/Plugins/Qt/qt_menu.cpp
index f1bd00a3..196a3aba 100755
--- a/src/src/Plugins/Qt/qt_menu.cpp
+++ b/src/src/Plugins/Qt/qt_menu.cpp
@@ -414,8 +414,6 @@ simple_widget_rep::as_qaction () {
   return a;
 }
 
-#include "QTMMenuHelper.moc"
-
 void
 QTMLazyMenu::force () {
   if (!forced) {
diff --git a/src/src/Plugins/Qt/qt_widget.cpp b/src/src/Plugins/Qt/qt_widget.cpp
index 32a6ccef..66c95e8d 100755
--- a/src/src/Plugins/Qt/qt_widget.cpp
+++ b/src/src/Plugins/Qt/qt_widget.cpp
@@ -529,8 +529,6 @@ qt_tm_widget_rep::send (slot s, blackbox val) {
   }
 }
 
-#include "QTMInteractiveInputHelper.moc"
-
 void
 QTMInteractiveInputHelper::doit () {
   wid->do_interactive_prompt();
diff --git a/src/src/makefile.in b/src/src/makefile.in
index b215e7e0..3fd2f508 100644
--- a/src/src/makefile.in
+++ b/src/src/makefile.in
@@ -145,9 +145,9 @@ texmacs_incl  := $(guile_incl)
 # MOC files
 ###############################################################################
 
-qt_moc := Plugins/Qt/QTMStyle.moc Plugins/Qt/QTMGuiHelper.moc Plugins/Qt/QTMInteractiveInputHelper.moc Plugins/Qt/QTMMenuHelper.moc Plugins/Qt/QTMWidget.moc
+qt_moc := Plugins/Qt/moc_QTMStyle.cpp Plugins/Qt/moc_QTMGuiHelper.cpp Plugins/Qt/moc_QTMInteractiveInputHelper.cpp Plugins/Qt/moc_QTMMenuHelper.cpp Plugins/Qt/moc_QTMWidget.cpp
 
-%.moc: %.hpp
+moc_%.cpp: %.hpp
 	$(MOC) $(MOCFLAGS) $< -o $@
 
 ###############################################################################
@@ -362,7 +362,7 @@ DISTR:
 
 CLEAN: DISTR
 	$(RM) Objects/*.o
-	$(RM) Plugins/Qt/*.moc
+	$(RM) Plugins/Qt/moc_*.cpp
 
 clean: CLEAN
 
-- 
2.11.4.GIT