Bug 932280 - [Qt] Move moc_ files to Makefile.in in order to pass existance check for autogenerated files. r=Ms2ger

dom/plugins/ipc/Makefile.in

@@ -8,6 +8,12 @@ DEFINES += \
   $(NULL)
 endif
 
+ifdef MOZ_ENABLE_QT
+CPPSRCS += \
+  moc_NestedLoopTimer.cpp \
+  $(NULL)
+endif
+
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base \
   -I$(topsrcdir)/xpcom/base/ \

dom/plugins/ipc/moz.build

@@ -62,7 +62,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 
 if CONFIG['MOZ_ENABLE_QT']:
     SOURCES += [
-        'moc_NestedLoopTimer.cpp',
         'NestedLoopTimer.cpp',
     ]
 

dom/system/unix/Makefile.in

@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ifdef MOZ_ENABLE_QTMOBILITY
+CPPSRCS += moc_QTMLocationProvider.cpp
 LOCAL_INCLUDES  += $(MOZ_QT_CFLAGS) \
                    -I$(topsrcdir)/dom/src/geolocation \
                    $(NULL)

dom/system/unix/moz.build

@@ -8,7 +8,6 @@ MODULE = 'dom'
 
 if CONFIG['MOZ_ENABLE_QTMOBILITY']:
     SOURCES += [
-        'moc_QTMLocationProvider.cpp',
         'QTMLocationProvider.cpp',
     ]
 

ipc/chromium/Makefile.in

@@ -102,6 +102,12 @@ endif # }
 
 OS_CXXFLAGS += $(TK_CFLAGS)
 
+ifdef MOZ_ENABLE_QT
+CPPSRCS += \
+  moc_message_pump_qt.cc \
+  $(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_NATIVE_LIBEVENT # {

ipc/chromium/moz.build

@@ -197,7 +197,6 @@ if os_linux:
     if CONFIG['MOZ_ENABLE_QT']:
         SOURCES += [
             'src/base/message_pump_qt.cc',
-            'src/base/moc_message_pump_qt.cc',
         ]
 
 if os_bsd:

toolkit/xre/Makefile.in

@@ -107,6 +107,12 @@ SHARED_LIBRARY_LIBS += \
 endif
 endif
 
+ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+CPPSRCS += \
+  moc_nsNativeAppSupportQt.cpp \
+  $(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \

toolkit/xre/moz.build

@@ -40,7 +40,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS += ['nsQAppInstance.h']
     SOURCES += [
-        'moc_nsNativeAppSupportQt.cpp',
         'nsNativeAppSupportQt.cpp',
         'nsQAppInstance.cpp',
     ]

widget/qt/Makefile.in

@@ -5,6 +5,24 @@
 
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
+ifdef MOZ_ENABLE_CONTENTMANAGER
+CPPSRCS += \
+    moc_nsMFilePicker.cpp \
+    $(NULL)
+endif
+
+ifdef MOZ_ENABLE_QTMOBILITY
+CPPSRCS += \
+    moc_mozqorientationsensorfilter.cpp \
+    $(NULL)
+endif
+
+CPPSRCS += \
+    moc_moziqwidget.cpp \
+    moc_mozqwidget.cpp \
+    moc_nsAppShell.cpp \
+    $(NULL)
+
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS	+= $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \

widget/qt/faststartupqt/Makefile.in

@@ -11,6 +11,11 @@ EXTRA_DSO_LDOPTS = \
 	$(MOZ_QT_LIBS) \
 	$(NULL)
 
+CPPSRCS += \
+	moc_moziqwidget.cpp \
+	moc_nsFastStartupQt.cpp \
+	$(NULL)
+
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/xpcom/build \
 	-I$(topsrcdir)/widget/qt \
@@ -19,9 +24,7 @@ LOCAL_INCLUDES += \
 EXPORT_SOURCES = \
 	$(topsrcdir)/widget/qt/moziqwidget.h \
 	$(topsrcdir)/toolkit/xre/nsQAppInstance.h \
-	$(topsrcdir)/toolkit/xre/nsQAppInstance.cpp \
-	$(topsrcdir)/widget/qt/mozqglwidgetwrapper.h \
-	$(topsrcdir)/widget/qt/mozqglwidgetwrapper.cpp
+	$(topsrcdir)/widget/qt/mozqglwidgetwrapper.h
 
 GARBAGE += $(EXPORT_SOURCES)
 export:: $(EXPORT_SOURCES)

widget/qt/faststartupqt/moz.build

@@ -7,12 +7,10 @@
 MODULE = 'faststartupqt'
 
 SOURCES += [
-    'moc_moziqwidget.cpp',
-    'moc_nsFastStartupQt.cpp',
-    'mozqglwidgetwrapper.cpp',
+    '../../../toolkit/xre/nsQAppInstance.cpp',
+    '../mozqglwidgetwrapper.cpp',
     'mozqwidgetfast.cpp',
     'nsFastStartupQt.cpp',
-    'nsQAppInstance.cpp',
 ]
 
 LIBRARY_NAME = 'faststartupqt'

widget/qt/moz.build

@@ -13,9 +13,6 @@ EXPORTS += [
 ]
 
 SOURCES += [
-    'moc_moziqwidget.cpp',
-    'moc_mozqwidget.cpp',
-    'moc_nsAppShell.cpp',
     'mozqglwidgetwrapper.cpp',
     'mozqwidget.cpp',
     'mozSwipeGesture.cpp',
@@ -41,13 +38,11 @@ SOURCES += [
 
 if CONFIG['MOZ_ENABLE_CONTENTMANAGER']:
     SOURCES += [
-        'moc_nsMFilePicker.cpp',
         'nsMFilePicker.cpp',
     ]
 
-if CONFIG[' MOZ_ENABLE_QTMOBILITY']:
+if CONFIG['MOZ_ENABLE_QTMOBILITY']:
     SOURCES += [
-        'moc_mozqorientationsensorfilter.cpp',
         'mozqorientationsensorfilter.cpp',
     ]