Bug 932197 - Put QT generated files in GENERATED_SOURCES. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 01 Nov 2013 10:30:45 +0900
changeset 152932 f61be58972b6b0200a29f990add43d0e764c95e2
parent 152931 564210bf70b39f6cc0223eec802521e83a97151c
child 152933 48444fee320e4642934c5868aba86c8bb9273d3a
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersgps
bugs932197
milestone28.0a1
Bug 932197 - Put QT generated files in GENERATED_SOURCES. r=gps
dom/plugins/ipc/moz.build
dom/system/unix/moz.build
ipc/chromium/moz.build
netwerk/system/qt/moz.build
toolkit/xre/moz.build
widget/qt/faststartupqt/moz.build
widget/qt/moz.build
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -56,18 +56,20 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS.mozilla.plugins += [
         'PluginInterposeOSX.h',
     ]
 
 if CONFIG['MOZ_ENABLE_QT']:
+    GENERATED_SOURCES += [
+        'moc_NestedLoopTimer.cpp',
+    ]
     SOURCES += [
-        'moc_NestedLoopTimer.cpp',
         'NestedLoopTimer.cpp',
     ]
 
 SOURCES += [
     'BrowserStreamChild.cpp',
     'BrowserStreamParent.cpp',
     'ChildAsyncCall.cpp',
     'ChildTimer.cpp',
--- a/dom/system/unix/moz.build
+++ b/dom/system/unix/moz.build
@@ -2,18 +2,20 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'dom'
 
 if CONFIG['MOZ_ENABLE_QTMOBILITY']:
+    GENERATED_SOURCES += [
+        'moc_QTMLocationProvider.cpp',
+    ]
     SOURCES += [
-        'moc_QTMLocationProvider.cpp',
         'QTMLocationProvider.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domsystemunix_s'
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -218,16 +218,18 @@ if os_linux:
     ]
     if CONFIG['MOZ_WIDGET_GTK']:
         SOURCES += [
             'src/base/message_pump_glib.cc',
         ]
     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':
         SOURCES += [
             'src/third_party/libevent/epoll_sub.c',
         ]
     SOURCES += [
         'src/third_party/libevent/epoll.c',
@@ -248,16 +250,18 @@ if os_bsd:
         ]
     if CONFIG['MOZ_WIDGET_GTK']:
         SOURCES += [
             'src/base/message_pump_glib.cc',
         ]
     if CONFIG['MOZ_ENABLE_QT']:
         SOURCES += [
             'src/base/message_pump_qt.cc',
+        ]
+        GENERATED_SOURCES += [
             'src/base/moc_message_pump_qt.cc',
         ]
     SOURCES += [
         'src/third_party/libevent/kqueue.c',
     ]
 
 if CONFIG['_MSC_VER']:
     SOURCES += [
--- a/netwerk/system/qt/moz.build
+++ b/netwerk/system/qt/moz.build
@@ -2,19 +2,22 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'necko'
 
 SOURCES += [
-    'moc_nsQtNetworkManager.cpp',
     'nsQtNetworkLinkService.cpp',
     'nsQtNetworkManager.cpp',
 ]
 
+GENERATED_SOURCES += [
+    'moc_nsQtNetworkManager.cpp',
+]
+
 LIBRARY_NAME = 'neckosystem_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -34,18 +34,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
     SOURCES += [
         'MacApplicationDelegate.mm',
         'MacAutoreleasePool.mm',
         'MacLaunchHelper.mm',
         'nsNativeAppSupportCocoa.mm',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS += ['nsQAppInstance.h']
+    GENERATED_SOURCES += [
+        'moc_nsNativeAppSupportQt.cpp',
+    ]
     SOURCES += [
-        'moc_nsNativeAppSupportQt.cpp',
         'nsNativeAppSupportQt.cpp',
         'nsQAppInstance.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     SOURCES += [
         'nsNativeAppSupportOS2.cpp',
     ]
 elif CONFIG['MOZ_ENABLE_GTK']:
--- a/widget/qt/faststartupqt/moz.build
+++ b/widget/qt/faststartupqt/moz.build
@@ -1,20 +1,26 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 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'
 
 FORCE_STATIC_LIB = True
--- a/widget/qt/moz.build
+++ b/widget/qt/moz.build
@@ -7,20 +7,23 @@
 DIRS += ['faststartupqt']
 
 MODULE = 'widget'
 
 EXPORTS += [
     'nsQtKeyUtils.h',
 ]
 
-SOURCES += [
+GENERATED_SOURCES += [
     'moc_moziqwidget.cpp',
     'moc_mozqwidget.cpp',
     'moc_nsAppShell.cpp',
+]
+
+SOURCES += [
     'mozqglwidgetwrapper.cpp',
     'mozqwidget.cpp',
     'mozSwipeGesture.cpp',
     'nsAppShell.cpp',
     'nsBidiKeyboard.cpp',
     'nsClipboard.cpp',
     'nsDeviceContextSpecQt.cpp',
     'nsDragService.cpp',
@@ -36,24 +39,28 @@ SOURCES += [
     'nsScreenQt.cpp',
     'nsSound.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
 ]
 
 if CONFIG['MOZ_ENABLE_CONTENTMANAGER']:
     SOURCES += [
+        'nsMFilePicker.cpp',
+    ]
+    GENERATED_SOURCES += [
         'moc_nsMFilePicker.cpp',
-        'nsMFilePicker.cpp',
     ]
 
 if CONFIG[' MOZ_ENABLE_QTMOBILITY']:
     SOURCES += [
+        'mozqorientationsensorfilter.cpp',
+    ]
+    GENERATED_SOURCES += [
         'moc_mozqorientationsensorfilter.cpp',
-        'mozqorientationsensorfilter.cpp',
     ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'widget_qt'
 
 EXPORT_LIBRARY = True