--- config.tests/snappy/snappy.pro.orig	2018-11-26 21:10:38.000000000 -0700
+++ config.tests/snappy/snappy.pro	2018-12-08 12:40:39.000000000 -0700
@@ -1,3 +1,3 @@
-linux:SOURCES += snappy.cpp
+SOURCES += snappy.cpp
 LIBS += -lsnappy
 CONFIG -= qt
--- src/core/configure.json.orig	2018-11-26 21:10:38.000000000 -0700
+++ src/core/configure.json	2018-12-09 10:07:41.000000000 -0700
@@ -344,82 +344,82 @@
     "features": {
         "webengine-system-fontconfig": {
             "label": "fontconfig",
-            "condition": "libs.webengine-fontconfig",
+            "condition": "config.macos && libs.webengine-fontconfig",
             "output": [ "privateFeature" ]
         },
         "webengine-system-dbus": {
             "label": "dbus",
-            "condition": "libs.webengine-dbus",
+            "condition": "config.macos && libs.webengine-dbus",
             "output": [ "privateFeature" ]
         },
         "webengine-system-libdrm": {
             "label": "libdrm",
-            "condition": "libs.webengine-libdrm",
+            "condition": "!config.macos && libs.webengine-libdrm",
             "output": [ "privateFeature" ]
         },
         "webengine-system-xcomposite": {
             "label": "xcomposite",
-            "condition": "libs.webengine-xcomposite",
+            "condition": "!config.macos && libs.webengine-xcomposite",
             "output": [ "privateFeature" ]
         },
         "webengine-system-xcursor": {
             "label": "xcursor",
-            "condition": "libs.webengine-xcursor",
+            "condition": "!config.macos && libs.webengine-xcursor",
             "output": [ "privateFeature" ]
         },
         "webengine-system-xi": {
             "label": "xi",
-            "condition": "libs.webengine-xi",
+            "condition": "!config.macos && libs.webengine-xi",
             "output": [ "privateFeature" ]
         },
         "webengine-system-xtst": {
             "label": "xtst",
-            "condition": "libs.webengine-xtst",
+            "condition": "!config.macos && libs.webengine-xtst",
             "output": [ "privateFeature" ]
         },
         "webengine-system-harfbuzz": {
             "label": "harfbuzz",
-            "condition": "config.unix && features.system-harfbuzz && libs.webengine-harfbuzz",
+            "condition": "config.macos && config.unix && features.system-harfbuzz && libs.webengine-harfbuzz",
             "output": [ "privateFeature" ]
         },
         "webengine-system-glib" : {
             "label": "glib",
-            "condition": "config.unix && libs.webengine-glib",
+            "condition": "config.macos && config.unix && libs.webengine-glib",
             "output": [ "privateFeature" ]
         },
         "webengine-system-minizip" : {
             "label": "minizip",
-            "condition": "config.unix && libs.webengine-minizip",
+            "condition": "config.macos && config.unix && libs.webengine-minizip",
             "output": [ "privateFeature" ]
         },
         "webengine-system-zlib" : {
             "label": "zlib",
-            "condition": "config.unix && features.system-zlib && libs.webengine-zlib",
+            "condition": "config.macos && config.unix && features.system-zlib && libs.webengine-zlib",
             "output": [ "privateFeature" ]
         },
         "webengine-system-libevent" : {
             "label": "libevent",
-            "condition": "config.unix && libs.webengine-libevent",
+            "condition": "config.macos && config.unix && libs.webengine-libevent",
             "output": [ "privateFeature" ]
         },
         "webengine-system-jsoncpp" : {
             "label": "jsoncpp",
-            "condition": "config.unix && libs.webengine-jsoncpp",
+            "condition": "config.macos && config.unix && libs.webengine-jsoncpp",
             "output": [ "privateFeature" ]
         },
         "webengine-system-protobuf" : {
             "label": "protobuf",
-            "condition": "config.unix && libs.webengine-protobuf && tests.webengine-protoc",
+            "condition": "config.macos && config.unix && libs.webengine-protobuf && tests.webengine-protoc",
             "output": [ "privateFeature" ]
         },
         "webengine-system-png" : {
             "label": "png",
-            "condition": "config.unix && features.system-png && libs.webengine-png",
+            "condition": "config.macos && config.unix && features.system-png && libs.webengine-png",
             "output": [ "privateFeature" ]
         },
         "webengine-system-jpeg" : {
             "label": "JPEG",
-            "condition": "config.unix && features.system-jpeg && libs.webengine-jpeglib",
+            "condition": "config.macos && config.unix && features.system-jpeg && libs.webengine-jpeglib",
             "output": [ "privateFeature" ]
         },
         "webengine-python2": {
@@ -463,7 +463,7 @@
         },
         "webengine-alsa": {
             "label": "Use ALSA",
-            "condition": "config.unix && tests.webengine-alsa",
+            "condition": "!config.macos && config.unix && tests.webengine-alsa",
             "output": [ "privateFeature" ]
         },
         "webengine-v8-snapshot": {
@@ -479,17 +479,17 @@
         },
         "webengine-system-khr" : {
             "label": "khr",
-            "condition": "config.unix && tests.webengine-khr",
+            "condition": "!config.macos && config.unix && tests.webengine-khr",
             "output": [ "privateFeature" ]
         },
         "webengine-system-libvpx" : {
             "label": "libvpx",
-            "condition": "config.unix && tests.webengine-libvpx",
+            "condition": "!config.macos && config.unix && tests.webengine-libvpx",
             "output": [ "privateFeature" ]
         },
         "webengine-system-snappy" : {
             "label": "snappy",
-            "condition": "config.unix && tests.webengine-snappy",
+            "condition": "config.macos && config.unix && tests.webengine-snappy",
             "output": [ "privateFeature" ]
         },
         "webengine-winversion" : {
@@ -499,13 +499,13 @@
         },
         "webengine-geolocation": {
             "label": "Geolocation",
-            "condition": "module.positioning",
+            "condition": "config.macos && module.positioning",
             "output": [ "publicFeature" ]
         },
         "webengine-pulseaudio": {
             "label": "Use PulseAudio",
             "autoDetect": "config.unix",
-            "condition": "libs.pulseaudio",
+            "condition": "config.macos && libs.pulseaudio",
             "output": [ "privateFeature" ]
         },
         "webengine-pepper-plugins": {
@@ -581,31 +581,31 @@
         "webengine-system-libwebp": {
             "label": "libwebp, libwebpmux and libwebpdemux",
             "autoDetect": "config.unix",
-            "condition": "libs.webengine-webp",
+            "condition": "config.macos && libs.webengine-webp",
             "output": [ "privateFeature" ]
         },
         "webengine-system-opus": {
             "label": "opus",
             "autoDetect": "config.unix",
-            "condition": "libs.webengine-opus",
+            "condition": "config.macos && libs.webengine-opus",
             "output": [ "privateFeature" ]
         },
         "webengine-system-ffmpeg": {
             "label": "ffmpeg",
             "autoDetect": false,
-            "condition": "libs.webengine-ffmpeg && features.webengine-system-opus && features.webengine-system-libwebp",
+            "condition": "config.macos && libs.webengine-ffmpeg && features.webengine-system-opus && features.webengine-system-libwebp",
             "output": [ "privateFeature" ]
         },
         "webengine-system-icu": {
             "label": "icu",
             "autoDetect": false,
-            "condition": "libs.webengine-icu",
+            "condition": "config.macos && libs.webengine-icu",
             "output": [ "privateFeature" ]
         },
         "webengine-system-re2": {
             "label": "re2",
             "autoDetect": "config.unix",
-            "condition": "tests.webengine-re2",
+            "condition": "config.macos && tests.webengine-re2",
             "output": [ "privateFeature" ]
         },
         "webengine-system-ninja": {
@@ -621,12 +621,12 @@
         },
         "webengine-system-glibc": {
             "label": "glibc",
-            "condition": "config.linux && tests.webengine-glibc",
+            "condition": "config.macos && config.linux && tests.webengine-glibc",
             "output": [ "privateFeature" ]
         },
         "webengine-system-libxml2": {
             "label": "libxml2 and libxslt",
-            "condition": "config.unix
+            "condition": "config.macos && config.unix
                          && libs.webengine-libxml2
                          && tests.webengine-libxml2-compatible",
             "output": [ "privateFeature" ]
@@ -634,17 +634,17 @@
         "webengine-system-lcms2" : {
             "label": "lcms2",
             "autoDetect": "features.webengine-printing-and-pdf",
-            "condition": "config.unix && libs.webengine-lcms2",
+            "condition": "config.macos && config.unix && libs.webengine-lcms2",
             "output": [ "privateFeature" ]
         },
         "webengine-system-freetype" : {
             "label": "freetype",
-            "condition": "config.unix && features.system-freetype && libs.webengine-freetype",
+            "condition": "config.macos && config.unix && features.system-freetype && libs.webengine-freetype",
             "output": [ "privateFeature" ]
         },
         "webengine-system-x11" : {
             "label": "x11",
-            "condition": "config.unix && libs.webengine-x11",
+            "condition": "!config.macos && config.unix && libs.webengine-x11",
             "output": [ "privateFeature" ]
         },
         "webengine-ozone-x11" : {
@@ -667,7 +667,7 @@
         "webengine-poppler-cpp": {
             "label": "poppler-cpp",
             "autoDetect": "config.unix",
-            "condition": "libs.webengine-poppler-cpp",
+            "condition": "config.macos && libs.webengine-poppler-cpp",
             "output": [ "privateFeature" ]
         },
         "webengine-win-compiler64": {