summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-09-27 09:07:52 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-09-27 09:07:52 +0200
commit314fb761d144b160d3aeb72840c89e31c4f21a4a (patch)
tree0794190c7b9f541b3dced0b1f6b15979f447e3e5 /modules
parentfbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5 (diff)
parent2b9e0ca0bbea04fca6e0fd5079877d355f27c9b6 (diff)
downloadUXP-2018.09.27.tar
UXP-2018.09.27.tar.gz
UXP-2018.09.27.tar.lz
UXP-2018.09.27.tar.xz
UXP-2018.09.27.zip
Merge branch 'master' into Basilisk-releasev2018.09.27
Diffstat (limited to 'modules')
-rw-r--r--modules/libpref/init/all.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index a4834e3ec..32c59e737 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -705,6 +705,10 @@ pref("apz.y_skate_size_multiplier", "1.5");
pref("apz.y_stationary_size_multiplier", "1.5");
#endif
+#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_UIKIT)
+pref("apz.desktop.enabled", false);
+#endif
+
#ifdef XP_MACOSX
// Whether to run in native HiDPI mode on machines with "Retina"/HiDPI display;
// <= 0 : hidpi mode disabled, display will just use pixel-based upscaling