Bug 932197 - Put QT generated files in GENERATED_SOURCES. r=gps

dom/plugins/ipc/moz.build

@@ -61,8 +61,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     ]
 
 if CONFIG['MOZ_ENABLE_QT']:
-    SOURCES += [
+    GENERATED_SOURCES += [
         'moc_NestedLoopTimer.cpp',
+    ]
+    SOURCES += [
         'NestedLoopTimer.cpp',
     ]
 

dom/system/unix/moz.build

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

ipc/chromium/moz.build

@@ -223,6 +223,8 @@ if os_linux:
     if CONFIG['MOZ_ENABLE_QT']:
         SOURCES += [
             'src/base/message_pump_qt.cc',
+        ]
+        GENERATED_SOURCES += [
             'src/base/moc_message_pump_qt.cc',
         ]
     if CONFIG['OS_TARGET'] != 'Android':
@@ -253,6 +255,8 @@ if os_bsd:
     if CONFIG['MOZ_ENABLE_QT']:
         SOURCES += [
             'src/base/message_pump_qt.cc',
+        ]
+        GENERATED_SOURCES += [
             'src/base/moc_message_pump_qt.cc',
         ]
     SOURCES += [

netwerk/system/qt/moz.build

@@ -7,11 +7,14 @@
 MODULE = 'necko'
 
 SOURCES += [
-    'moc_nsQtNetworkManager.cpp',
     'nsQtNetworkLinkService.cpp',
     'nsQtNetworkManager.cpp',
 ]
 
+GENERATED_SOURCES += [
+    'moc_nsQtNetworkManager.cpp',
+]
+
 LIBRARY_NAME = 'neckosystem_s'
 
 FAIL_ON_WARNINGS = True

toolkit/xre/moz.build

@@ -39,8 +39,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS += ['nsQAppInstance.h']
-    SOURCES += [
+    GENERATED_SOURCES += [
         'moc_nsNativeAppSupportQt.cpp',
+    ]
+    SOURCES += [
         'nsNativeAppSupportQt.cpp',
         'nsQAppInstance.cpp',
     ]

widget/qt/faststartupqt/moz.build

@@ -6,13 +6,19 @@
 
 MODULE = 'faststartupqt'
 
-SOURCES += [
+GENERATED_SOURCES += [
     'moc_moziqwidget.cpp',
     'moc_nsFastStartupQt.cpp',
-    'mozqglwidgetwrapper.cpp',
     'mozqwidgetfast.cpp',
+]
+
+SOURCES += [
+    TOPSRCDIR + '/toolkit/xre/nsQAppInstance.cpp',
+    TOPSRCDIR + '/widget/qt/mozqglwidgetwrapper.cpp',
+]
+
+SOURCES += [
     'nsFastStartupQt.cpp',
-    'nsQAppInstance.cpp',
 ]
 
 LIBRARY_NAME = 'faststartupqt'

widget/qt/moz.build

@@ -12,10 +12,13 @@ EXPORTS += [
     'nsQtKeyUtils.h',
 ]
 
-SOURCES += [
+GENERATED_SOURCES += [
     'moc_moziqwidget.cpp',
     'moc_mozqwidget.cpp',
     'moc_nsAppShell.cpp',
+]
+
+SOURCES += [
     'mozqglwidgetwrapper.cpp',
     'mozqwidget.cpp',
     'mozSwipeGesture.cpp',
@@ -41,15 +44,19 @@ SOURCES += [
 
 if CONFIG['MOZ_ENABLE_CONTENTMANAGER']:
     SOURCES += [
-        'moc_nsMFilePicker.cpp',
         'nsMFilePicker.cpp',
     ]
+    GENERATED_SOURCES += [
+        'moc_nsMFilePicker.cpp',
+    ]
 
 if CONFIG[' MOZ_ENABLE_QTMOBILITY']:
     SOURCES += [
-        'moc_mozqorientationsensorfilter.cpp',
         'mozqorientationsensorfilter.cpp',
     ]
+    GENERATED_SOURCES += [
+        'moc_mozqorientationsensorfilter.cpp',
+    ]
 
 LIBXUL_LIBRARY = True