Bug 578718 Qt should use modern unix keybindings instead of classic keybindings
authortimeless@mozdev.org
Fri, 13 Aug 2010 16:15:32 +0200
changeset 50612 f21ae93d9ff1118bd828dd7813e4adbe3ad8a497
parent 50611 2697c4534d64e8c5f545fc917852dbf49a12723f
child 50614 265a975edd64fd07cd99200445a151b2b2e5f4d1
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs578718
milestone2.0b4pre
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 578718 Qt should use modern unix keybindings instead of classic keybindings r=ted a=blocking-fennec2.0b1
content/xbl/builtin/Makefile.in
content/xbl/builtin/gtk2/Makefile.in
content/xbl/builtin/gtk2/jar.mn
content/xbl/builtin/gtk2/platformHTMLBindings.xml
content/xbl/builtin/unix/Makefile.in
content/xbl/builtin/unix/jar.mn
content/xbl/builtin/unix/platformHTMLBindings.xml
toolkit/toolkit-makefiles.sh
--- a/content/xbl/builtin/Makefile.in
+++ b/content/xbl/builtin/Makefile.in
@@ -43,17 +43,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
 DIRS	= win
 else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 DIRS	= mac
 else
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-DIRS	= gtk2
+ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT)))
+DIRS	= unix
 else
 DIRS	= emacs
 endif
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk
rename from content/xbl/builtin/gtk2/Makefile.in
rename to content/xbl/builtin/unix/Makefile.in
rename from content/xbl/builtin/gtk2/jar.mn
rename to content/xbl/builtin/unix/jar.mn
rename from content/xbl/builtin/gtk2/platformHTMLBindings.xml
rename to content/xbl/builtin/unix/platformHTMLBindings.xml
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -250,18 +250,18 @@ MAKEFILES_content="
   content/xul/templates/src/Makefile
   content/xul/templates/tests/Makefile
   content/xul/templates/tests/chrome/Makefile
   content/xbl/Makefile
   content/xbl/public/Makefile
   content/xbl/src/Makefile
   content/xbl/builtin/Makefile
   content/xbl/builtin/emacs/Makefile
-  content/xbl/builtin/gtk2/Makefile
   content/xbl/builtin/mac/Makefile
+  content/xbl/builtin/unix/Makefile
   content/xslt/Makefile
   content/xslt/public/Makefile
   content/xslt/src/Makefile
   content/xslt/src/base/Makefile
   content/xslt/src/xml/Makefile
   content/xslt/src/xpath/Makefile
   content/xslt/src/xslt/Makefile
   content/xslt/src/main/Makefile