Bug 985814 - Skia cannot compile properly for Qt Widget backend. r=gw280
authorTatiana Meshkova <tanya.meshkova@gmail.com>
Sat, 22 Mar 2014 05:38:40 -0700
changeset 194470 120de5eefe7451823e0e32f1ed1b0c63d7b05e7a
parent 194469 fef29327a1b1562dabc85dc96ca25678731214c8
child 194471 f8613d9d677dc66a81346538b03837f0ed50913e
push id486
push userasasaki@mozilla.com
push dateMon, 14 Jul 2014 18:39:42 +0000
treeherdermozilla-release@d33428174ff1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgw280
bugs985814
milestone31.0a1
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 985814 - Skia cannot compile properly for Qt Widget backend. r=gw280
dom/src/geolocation/moz.build
gfx/skia/generate_mozbuild.py
gfx/skia/moz.build
--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@@ -23,17 +23,17 @@ LOCAL_INCLUDES += [
     '/content/base/src',
     '/dom/base',
     '/dom/events',
     '/dom/ipc',
 ]
 
 if CONFIG['MOZ_ENABLE_QT5GEOPOSITION']:
     LOCAL_INCLUDES += [
-        '/dom/system/unix',
+        '/dom/system/qt',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     LOCAL_INCLUDES += [
         '/dom/system/android',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     LOCAL_INCLUDES += [
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -66,17 +66,17 @@ if CONFIG['INTEL_ARCHITECTURE'] and CONF
     DEFINES['SK_BUILD_SSSE3'] = 1
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     DEFINES['SK_FONTHOST_CAIRO_STANDALONE'] = 0
 
 if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android') or \
    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa') or \
    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk') or \
-   CONFIG['MOZ_WIDGET_QT'] or \
+   (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt') or \
    CONFIG['MOZ_WIDGET_GTK']:
     DEFINES['SK_FONTHOST_DOES_NOT_USE_FONTMGR'] = 1
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DEFINES['SKIA_DLL'] = 1
     DEFINES['GR_DLL'] = 1
 
 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC']:
@@ -316,17 +316,17 @@ def write_mozbuild(includes, sources):
   write_list(f, 'SOURCES', sources['android'], 4)
 
   f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':\n")
   write_list(f, 'SOURCES', sources['mac'], 4)
 
   f.write("if CONFIG['MOZ_WIDGET_GTK']:\n")
   write_list(f, 'SOURCES', sources['linux'], 4)
 
-  f.write("if CONFIG['MOZ_WIDGET_QT']:\n")
+  f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':\n")
   write_list(f, 'SOURCES', sources['linux'], 4)
 
   f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':\n")
   write_list(f, 'SOURCES', sources['win'], 4)
 
   f.write("\n\n")
   f.write("if CONFIG['INTEL_ARCHITECTURE']:\n")
   write_list(f, 'SOURCES', sources['intel'], 4)
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -724,17 +724,17 @@ if CONFIG['MOZ_WIDGET_GTK']:
         'trunk/src/ports/SkFontHost_cairo.cpp',
         'trunk/src/ports/SkFontHost_FreeType.cpp',
         'trunk/src/ports/SkFontHost_FreeType_common.cpp',
         'trunk/src/ports/SkOSFile_posix.cpp',
         'trunk/src/ports/SkTime_Unix.cpp',
         'trunk/src/ports/SkTLS_pthread.cpp',
         'trunk/src/utils/SkThreadUtils_pthread.cpp',
     ]
-if CONFIG['MOZ_WIDGET_QT']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     SOURCES += [
         'trunk/src/ports/SkDebug_stdio.cpp',
         'trunk/src/ports/SkFontHost_cairo.cpp',
         'trunk/src/ports/SkFontHost_FreeType.cpp',
         'trunk/src/ports/SkFontHost_FreeType_common.cpp',
         'trunk/src/ports/SkOSFile_posix.cpp',
         'trunk/src/ports/SkTime_Unix.cpp',
         'trunk/src/ports/SkTLS_pthread.cpp',
@@ -863,17 +863,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and
     DEFINES['SK_USE_POSIX_THREADS'] = 1
 
 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']:
     DEFINES['SK_BUILD_SSSE3'] = 1
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     DEFINES['SK_FONTHOST_CAIRO_STANDALONE'] = 0
 
-if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android') or    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa') or    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk') or    CONFIG['MOZ_WIDGET_QT'] or    CONFIG['MOZ_WIDGET_GTK']:
+if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android') or    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa') or    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk') or    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt') or    CONFIG['MOZ_WIDGET_GTK']:
     DEFINES['SK_FONTHOST_DOES_NOT_USE_FONTMGR'] = 1
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DEFINES['SKIA_DLL'] = 1
     DEFINES['GR_DLL'] = 1
 
 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC']:
     SOURCES['trunk/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']