diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 10:38:55 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 10:38:55 +0100 |
| commit | 5839763c827cc35973e419026f926e9b8ffc118d (patch) | |
| tree | 11fd29c791adc491430a7a9b516224c2a724868e /docshell/build | |
| parent | 83c4b04a70d2319d4c292e7aa0c8872e7c1cd7fa (diff) | |
| parent | 45f2fcd80d2a7d536e8b486c18415a337b56cb46 (diff) | |
| download | UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.gz UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.lz UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.xz UXP-5839763c827cc35973e419026f926e9b8ffc118d.zip | |
Merge branch 'master' into ported-moebius
# Conflicts:
# browser/installer/windows/nsis/stub.nsi
Diffstat (limited to 'docshell/build')
| -rw-r--r-- | docshell/build/moz.build | 3 | ||||
| -rw-r--r-- | docshell/build/nsDocShellModule.cpp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/docshell/build/moz.build b/docshell/build/moz.build index 130ec8736..e47bd89ed 100644 --- a/docshell/build/moz.build +++ b/docshell/build/moz.build @@ -23,6 +23,3 @@ LOCAL_INCLUDES += [ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' - -if CONFIG['MOZ_DEVTOOLS'] == 'all': - DEFINES['MOZ_DEVTOOLS_ALL'] = True diff --git a/docshell/build/nsDocShellModule.cpp b/docshell/build/nsDocShellModule.cpp index 1e62e1479..d43c305f9 100644 --- a/docshell/build/nsDocShellModule.cpp +++ b/docshell/build/nsDocShellModule.cpp @@ -169,7 +169,7 @@ const mozilla::Module::ContractIDEntry kDocShellContracts[] = { { NS_ABOUT_MODULE_CONTRACTID_PREFIX "crashes", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, #endif { NS_ABOUT_MODULE_CONTRACTID_PREFIX "credits", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, -#ifdef MOZ_DEVTOOLS_ALL +#ifdef MOZ_DEVTOOLS { NS_ABOUT_MODULE_CONTRACTID_PREFIX "debugging", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, #endif { NS_ABOUT_MODULE_CONTRACTID_PREFIX "license", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, |