Bug 1282866 - remove widget/qt and other supporting QT code, r=dougt.…

… This patch does not remove all of the checks for MOZ_WIDGET_QT (which are dead code), but that will be a followup mentored bug. MozReview-Commit-ID: EGqHHhCD7vD --HG-- extra : rebase_source : a4b9593959dd3ba80189db47eabb056ea207490f extra : amend_source : a744d833693f0fe7adbea961c00bb5fb55a91580
sailfishos · Jul 7, 2016 · bf05496 · bf05496
1 parent 4b4be5e
commit bf05496
Show file tree

Hide file tree

Showing 72 changed files with 16 additions and 7,729 deletions.
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
@@ -306,7 +306,6 @@ def old_configure_options(*options):
     '--with-nss-prefix',
     '--with-pthreads',
     '--with-qemu-exe',
-    '--with-qtdir',
     '--with-servo',
     '--with-sixgill',
     '--with-soft-float',

diff --git a/dom/geolocation/moz.build b/dom/geolocation/moz.build
@@ -26,12 +26,6 @@ LOCAL_INCLUDES += [
     '/dom/ipc',
 ]
 
-if CONFIG['MOZ_ENABLE_QT5GEOPOSITION']:
-    LOCAL_INCLUDES += [
-        '/dom/system/qt',
-    ]
-    CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     LOCAL_INCLUDES += [
         '/dom/system/android',

diff --git a/dom/geolocation/nsGeolocation.cpp b/dom/geolocation/nsGeolocation.cpp
@@ -35,10 +35,6 @@
 
 class nsIPrincipal;
 
-#ifdef MOZ_ENABLE_QT5GEOPOSITION
-#include "QTMLocationProvider.h"
-#endif
-
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidLocationProvider.h"
 #endif
@@ -698,10 +694,6 @@ nsresult nsGeolocationService::Init()
 
   obs->AddObserver(this, "xpcom-shutdown", false);
 
-#ifdef MOZ_ENABLE_QT5GEOPOSITION
-  mProvider = new QTMLocationProvider();
-#endif
-
 #ifdef MOZ_WIDGET_ANDROID
   mProvider = new AndroidLocationProvider();
 #endif

diff --git a/dom/plugins/ipc/NestedLoopTimer.cpp b/dom/plugins/ipc/NestedLoopTimer.cpp
diff --git a/dom/plugins/ipc/NestedLoopTimer.h b/dom/plugins/ipc/NestedLoopTimer.h
diff --git a/dom/plugins/ipc/PluginHelperQt.cpp b/dom/plugins/ipc/PluginHelperQt.cpp
diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build
@@ -67,13 +67,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
         'PluginInterposeOSX.h',
     ]
 
-if CONFIG['MOZ_ENABLE_QT']:
-    SOURCES += [
-        '!moc_NestedLoopTimer.cpp',
-        'NestedLoopTimer.cpp',
-        'PluginHelperQt.cpp',
-    ]
-
 UNIFIED_SOURCES += [
     'BrowserStreamChild.cpp',
     'BrowserStreamParent.cpp',

diff --git a/dom/plugins/test/testplugin/nptest_qt.cpp b/dom/plugins/test/testplugin/nptest_qt.cpp
diff --git a/dom/plugins/test/testplugin/testplugin.mozbuild b/dom/plugins/test/testplugin/testplugin.mozbuild
@@ -26,10 +26,6 @@ elif toolkit == 'android':
     UNIFIED_SOURCES += [
         'nptest_droid.cpp',
     ]
-elif toolkit == 'qt':
-    UNIFIED_SOURCES += [
-        'nptest_qt.cpp',
-    ]
 elif toolkit == 'windows':
     UNIFIED_SOURCES += [
         'nptest_windows.cpp',
@@ -61,13 +57,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
     OS_LIBS += CONFIG['XLIBS']
     OS_LIBS += CONFIG['XEXT_LIBS']
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
-    CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']
-    CFLAGS += CONFIG['MOZ_QT_CFLAGS']
-    OS_LIBS += CONFIG['MOZ_QT_LIBS']
-    OS_LIBS += CONFIG['XLDFLAGS']
-    OS_LIBS += CONFIG['XLIBS']
-
 if CONFIG['_MSC_VER']:
     # This is intended as a temporary hack to support building with VS2015.
     # conversion from 'X' to 'Y' requires a narrowing conversion

diff --git a/dom/system/qt/QTMLocationProvider.cpp b/dom/system/qt/QTMLocationProvider.cpp