Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1285554 - Remove remnants of widget/qt. r=dougt,mshal.
Because bug 1282866 removed Qt support but missed a bunch of things.
* * *
Bug 1285554 - more

--HG--
extra : rebase_source : c48d2485f1fdf1c961e08d91651bbca41e3a1a53
  • Loading branch information
nnethercote committed Jul 11, 2016
1 parent 0fa2600 commit a913f99
Show file tree
Hide file tree
Showing 34 changed files with 18 additions and 790 deletions.
2 changes: 1 addition & 1 deletion browser/base/content/browser-menubar.inc
Expand Up @@ -75,7 +75,7 @@
accesskey="&emailPageCmd.accesskey;"
command="Browser:SendLink"/>
<menuseparator/>
#if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT)
#if !defined(MOZ_WIDGET_GTK)
<menuitem id="menu_printSetup"
label="&printSetupCmd.label;"
accesskey="&printSetupCmd.accesskey;"
Expand Down
2 changes: 1 addition & 1 deletion browser/base/content/browser.css
Expand Up @@ -273,7 +273,7 @@ toolbar[customizing] > .overflow-button {
}
%endif

%if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT)
%if !defined(MOZ_WIDGET_GTK)
#TabsToolbar > .private-browsing-indicator {
-moz-box-ordinal-group: 1000;
}
Expand Down
6 changes: 3 additions & 3 deletions browser/base/content/browser.xul
Expand Up @@ -563,7 +563,7 @@
#ifdef MENUBAR_CAN_AUTOHIDE
toolbarname="&menubarCmd.label;"
accesskey="&menubarCmd.accesskey;"
#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
#if defined(MOZ_WIDGET_GTK)
autohide="true"
#endif
#endif
Expand Down Expand Up @@ -592,7 +592,7 @@
context="toolbar-context-menu"
collapsed="true">

#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
#if defined(MOZ_WIDGET_GTK)
<hbox id="private-browsing-indicator"
skipintoolbarset="true"/>
#endif
Expand Down Expand Up @@ -642,7 +642,7 @@
</menupopup>
</toolbarbutton>

#if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT)
#if !defined(MOZ_WIDGET_GTK)
<hbox class="private-browsing-indicator" skipintoolbarset="true"/>
#endif
#ifdef CAN_DRAW_IN_TITLEBAR
Expand Down
2 changes: 1 addition & 1 deletion browser/themes/moz.build
Expand Up @@ -8,7 +8,7 @@ toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']

if toolkit == 'cocoa':
DIRS += ['osx']
elif toolkit in ('gtk2', 'gtk3', 'qt'):
elif toolkit in ('gtk2', 'gtk3'):
DIRS += ['linux']
else:
DIRS += ['windows']
Expand Down
6 changes: 3 additions & 3 deletions browser/themes/shared/notification-icons.inc.css
Expand Up @@ -91,7 +91,7 @@
.geo-icon {
%ifdef XP_MACOSX
list-style-image: url(chrome://browser/skin/permissions.svg#geo-osx);
%elif defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
%elif defined(MOZ_WIDGET_GTK)
list-style-image: url(chrome://browser/skin/permissions.svg#geo-linux);
%else
list-style-image: url(chrome://browser/skin/permissions.svg#geo-windows);
Expand All @@ -101,7 +101,7 @@
.geo-icon.blocked {
%ifdef XP_MACOSX
list-style-image: url(chrome://browser/skin/permissions.svg#geo-osx-blocked);
%elif defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
%elif defined(MOZ_WIDGET_GTK)
list-style-image: url(chrome://browser/skin/permissions.svg#geo-linux-blocked);
%else
list-style-image: url(chrome://browser/skin/permissions.svg#geo-windows-blocked);
Expand All @@ -111,7 +111,7 @@
.popup-notification-icon[popupid="geolocation"] {
%ifdef XP_MACOSX
list-style-image: url(chrome://browser/skin/permissions.svg#geo-osx);
%elif defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
%elif defined(MOZ_WIDGET_GTK)
list-style-image: url(chrome://browser/skin/permissions.svg#geo-linux-detailed);
%else
list-style-image: url(chrome://browser/skin/permissions.svg#geo-windows-detailed);
Expand Down
2 changes: 1 addition & 1 deletion browser/themes/shared/tab-selected.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions dom/plugins/ipc/PluginModuleChild.cpp
Expand Up @@ -311,6 +311,7 @@ PluginModuleChild::InitForChrome(const std::string& aPluginFilename,
}

#if defined(MOZ_WIDGET_GTK)

typedef void (*GObjectDisposeFn)(GObject*);
typedef gboolean (*GtkWidgetScrollEventFn)(GtkWidget*, GdkEventScroll*);
typedef void (*GtkPlugEmbeddedFn)(GtkPlug*);
Expand Down
9 changes: 0 additions & 9 deletions intl/locale/nsLocaleService.cpp
Expand Up @@ -3,11 +3,6 @@
* 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/. */

#ifdef MOZ_WIDGET_QT
#include <QString>
#include <QtCore/QLocale>
#endif

#include "nsCOMPtr.h"
#include "nsILocale.h"
#include "nsILocaleService.h"
Expand Down Expand Up @@ -122,12 +117,8 @@ nsLocaleService::nsLocaleService(void)
RefPtr<nsLocale> resultLocale(new nsLocale());
NS_ENSURE_TRUE_VOID(resultLocale);

#ifdef MOZ_WIDGET_QT
const char* lang = QLocale::system().name().toUtf8();
#else
// Get system configuration
const char* lang = getenv("LANG");
#endif

nsAutoString xpLocale, platformLocale;
nsAutoString category, category_platform;
Expand Down
3 changes: 0 additions & 3 deletions ipc/chromium/src/base/message_loop.cc
Expand Up @@ -25,9 +25,6 @@
#if defined(MOZ_WIDGET_GTK)
#include "base/message_pump_glib.h"
#endif
#ifdef MOZ_WIDGET_QT
#include "base/message_pump_qt.h"
#endif
#endif
#ifdef ANDROID
#include "base/message_pump_android.h"
Expand Down
2 changes: 1 addition & 1 deletion layout/base/nsPresContext.cpp
Expand Up @@ -2054,7 +2054,7 @@ nsPresContext::UserFontSetUpdated(gfxUserFontEntry* aUpdatedFont)

bool usePlatformFontList = true;
#if defined(MOZ_WIDGET_GTK)
usePlatformFontList = gfxPlatformGtk::UseFcFontList();
usePlatformFontList = gfxPlatformGtk::UseFcFontList();
#endif

// xxx - until the Linux platform font list is always used, use full
Expand Down
5 changes: 0 additions & 5 deletions media/webrtc/signaling/test/common.build
Expand Up @@ -131,11 +131,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
'freetype',
]

if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
OS_LIBS += CONFIG['XLIBS']
OS_LIBS += CONFIG['TK_LIBS']
OS_LIBS += CONFIG['MOZ_PANGO_LIBS']

if CONFIG['OS_TARGET'] in ('Linux', 'DragonFly', 'FreeBSD', 'NetBSD',
'OpenBSD'):
OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
Expand Down
5 changes: 0 additions & 5 deletions old-configure.in
Expand Up @@ -1763,15 +1763,13 @@ if test -n "$MOZ_X11"; then
AC_CHECK_LIB(Xext, XextAddDisplay, [XEXT_LIBS="-lXext"],
[MISSING_X="$MISSING_X -lXext"], $XLIBS)

if test "$MOZ_WIDGET_TOOLKIT" != qt; then
AC_CHECK_LIB(Xt, XtFree, [ XT_LIBS="-lXt"], [
unset ac_cv_lib_Xt_XtFree
AC_CHECK_LIB(ICE, IceFlush, [XT_LIBS="-lICE $XT_LIBS"],, $XT_LIBS $XLIBS)
AC_CHECK_LIB(SM, SmcCloseConnection, [XT_LIBS="-lSM $XT_LIBS"],, $XT_LIBS $XLIBS)
AC_CHECK_LIB(Xt, XtFree, [ XT_LIBS="-lXt $XT_LIBS"],
[MISSING_X="$MISSING_X -lXt"], $X_PRE_LIBS $XT_LIBS $XLIBS)
])
fi

dnl ========================================================
dnl = Check for XShm
Expand Down Expand Up @@ -5968,9 +5966,6 @@ if test "$MOZ_TREE_CAIRO"; then
fi

case "$MOZ_WIDGET_TOOLKIT" in
qt)
QT_SURFACE_FEATURE="#define CAIRO_HAS_QT_SURFACE 1"
;;
cocoa | uikit)
QUARTZ_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_SURFACE 1"
QUARTZ_IMAGE_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_IMAGE_SURFACE 1"
Expand Down
2 changes: 1 addition & 1 deletion toolkit/components/filepicker/moz.build
Expand Up @@ -5,7 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

if CONFIG['MOZ_XUL'] and \
CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('android', 'qt', 'cocoa', 'windows'):
CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('android', 'cocoa', 'windows'):
XPIDL_MODULE = 'filepicker'
XPIDL_SOURCES += [
'nsIFileView.idl',
Expand Down
4 changes: 0 additions & 4 deletions toolkit/components/remote/moz.build
Expand Up @@ -18,10 +18,6 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
SOURCES += [
'nsGTKRemoteService.cpp',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
SOURCES += [
'nsQtRemoteService.cpp',
]

FINAL_LIBRARY = 'xul'

Expand Down
142 changes: 0 additions & 142 deletions toolkit/components/remote/nsQtRemoteService.cpp

This file was deleted.

37 changes: 0 additions & 37 deletions toolkit/components/remote/nsQtRemoteService.h

This file was deleted.

2 changes: 0 additions & 2 deletions toolkit/modules/AppConstants.jsm
Expand Up @@ -150,8 +150,6 @@ this.AppConstants = Object.freeze({
platform:
#ifdef MOZ_WIDGET_GTK
"linux",
#elif MOZ_WIDGET_QT
"linux",
#elif XP_WIN
"win",
#elif XP_MACOSX
Expand Down
2 changes: 1 addition & 1 deletion toolkit/moz.build
Expand Up @@ -39,7 +39,7 @@ if CONFIG['MOZ_MAINTENANCE_SERVICE']:

DIRS += ['xre']

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
DIRS += ['system/unixproxy']
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
DIRS += ['system/osxproxy']
Expand Down

0 comments on commit a913f99

Please sign in to comment.