From 85ed94a9823e9bf7f61890ba3c9f56ccd5f2f656 Mon Sep 17 00:00:00 2001 From: Chris Peterson Date: Tue, 10 Jul 2012 16:58:56 -0700 Subject: [PATCH] Bug 722042 - Part 4: Remove Qt code from mobile/android. r=blassey --- mobile/android/components/build/Makefile.in | 4 ---- mobile/android/components/build/nsShellService.cpp | 12 ------------ 2 files changed, 16 deletions(-) diff --git a/mobile/android/components/build/Makefile.in b/mobile/android/components/build/Makefile.in index 913b86a01325..f9de5fd970f7 100644 --- a/mobile/android/components/build/Makefile.in +++ b/mobile/android/components/build/Makefile.in @@ -28,8 +28,4 @@ CPPSRCS = \ nsShellService.cpp \ $(NULL) -ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),qt)) -LOCAL_INCLUDES += $(MOZ_QT_CFLAGS) -endif - include $(topsrcdir)/config/rules.mk diff --git a/mobile/android/components/build/nsShellService.cpp b/mobile/android/components/build/nsShellService.cpp index 8fbb748a6a07..306bf81d9ac7 100644 --- a/mobile/android/components/build/nsShellService.cpp +++ b/mobile/android/components/build/nsShellService.cpp @@ -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 -#include -#endif - #include "nsShellService.h" #include "nsString.h" @@ -18,14 +13,7 @@ NS_IMPL_ISUPPORTS1(nsShellService, nsIShellService) NS_IMETHODIMP nsShellService::SwitchTask() { -#if MOZ_WIDGET_QT - QWidget * window = QApplication::activeWindow(); - if (window) - window->showMinimized(); - return NS_OK; -#else return NS_ERROR_NOT_IMPLEMENTED; -#endif } NS_IMETHODIMP