Bug 896729 - Attempt to re-register network link service crashes nsComponentManager. r=bsmedberg
authorTatiana Meshkova <tanya.meshkova@gmail.com>
Fri, 26 Jul 2013 01:36:55 -0700
changeset 152693 7cd08e2beee18d11bd25c53e726008443d550b02
parent 152692 7fa4f478c76dbffc3fde5a2f7f2120bc7f3d79bd
child 152694 6b8affed55fa57eaf6b312e7187f0d95e6b14f36
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs896729
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 896729 - Attempt to re-register network link service crashes nsComponentManager. r=bsmedberg
toolkit/toolkit.mozbuild
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -205,18 +205,18 @@ if CONFIG['MOZ_REPLACE_MALLOC']:
     add_tier_dir('platform', 'memory/replace')
 
 if CONFIG['NS_TRACE_MALLOC']:
     add_tier_dir('platform', 'tools/trace-malloc')
 
 if CONFIG['MOZ_ENABLE_GNOME_COMPONENT']:
     add_tier_dir('platform', 'toolkit/system/gnome')
 
-# if libconic is present, it will do its own network monitoring
-if not CONFIG['MOZ_ENABLE_LIBCONIC'] and CONFIG['MOZ_ENABLE_DBUS']:
+# if libconic or QtNetwork is present, it will do its own network monitoring
+if not CONFIG['MOZ_ENABLE_LIBCONIC'] and not CONFIG['MOZ_ENABLE_QTNETWORK'] and CONFIG['MOZ_ENABLE_DBUS']:
     add_tier_dir('platform', 'toolkit/system/dbus')
 
 add_tier_dir('platform', 'addon-sdk')
 
 if CONFIG['MOZ_MAPINFO']:
     add_tier_dir('platform', 'tools/codesighs')
 
 if CONFIG['ENABLE_MARIONETTE'] or CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('gonk', 'android'):