6 files changed, 20 insertions, 7 deletions
diff --git a/Source/WebCore/bindings/scripts/preprocessor.pm b/Source/WebCore/bindings/scripts/preprocessor.pm
index a34e8461b..5d9376d65 100644
--- a/Source/WebCore/bindings/scripts/preprocessor.pm
+++ b/Source/WebCore/bindings/scripts/preprocessor.pm
@@ -24,6 +24,7 @@ use warnings;
 use Config;
 use IPC::Open2;
 use IPC::Open3;
+use Text::ParseWords;
 
 BEGIN {
    use Exporter   ();
@@ -59,6 +60,9 @@ sub applyPreprocessor
         } else {
             push(@args, qw(-E -P -x c++));
         }
+    } else {
+        @args = shellwords($preprocessor);
+        $preprocessor = shift @args;
     }
 
     if ($Config::Config{"osname"} eq "darwin") {
@@ -99,9 +103,12 @@ sub applyPreprocessor
             }
         };
     } elsif ($Config::Config{"osname"} eq "MSWin32") {
-        $pid = open2(\*PP_OUT, \*PP_IN, $preprocessor, @args, @macros, $fileName);
+        # Suppress STDERR so that if we're using cl.exe, the output
+        # name isn't needlessly echoed.
+        use Symbol 'gensym'; my $err = gensym;
+        $pid = open3(\*PP_IN, \*PP_OUT, $err, $preprocessor, @args, @macros, $fileName);
     } else {
-        $pid = open2(\*PP_OUT, \*PP_IN, split(' ', $preprocessor), @args, @macros, $fileName);
+        $pid = open2(\*PP_OUT, \*PP_IN, $preprocessor, @args, @macros, $fileName);
     }
     close PP_IN;
     my @documentContent = <PP_OUT>;
diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl
index 47cbc2f47..5d63b0810 100644
--- a/Source/WebCore/css/makegrammar.pl
+++ b/Source/WebCore/css/makegrammar.pl
@@ -73,7 +73,9 @@ if ($suffix eq ".y.in") {
 }
 
 my $fileBase = File::Spec->join($outputDir, $filename);
-system("\"$bison\" -d -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp");
+my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
+push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives.
+system(@bisonCommand) == 0 or die;
 
 open HEADER, ">$fileBase.h" or die;
 print HEADER << "EOF";
diff --git a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index 69c72309f..e94367287 100644
--- a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -70,7 +70,11 @@ bool FormDataIODevice::reset()
         m_currentFile->close();
 
     m_currentDelta = 0;
-    m_formElements = m_formData->elements();
+
+    if (m_formData)
+        m_formElements = m_formData->elements();
+    else
+        m_formElements.clear();
 
     prepareCurrentElement();
     return true;
diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake
index 68d95e1e5..378158615 100644
--- a/Source/cmake/OptionsQt.cmake
+++ b/Source/cmake/OptionsQt.cmake
@@ -319,7 +319,7 @@ list(APPEND QT_REQUIRED_COMPONENTS
 )
 set(QT_OPTIONAL_COMPONENTS OpenGL)
 
-if (ENABLE_TEST_SUPPORT)
+if (ENABLE_API_TESTS OR ENABLE_TEST_SUPPORT)
     list(APPEND QT_REQUIRED_COMPONENTS
         Test
     )
diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
index fe680b181..b52084f48 100644
--- a/Source/cmake/WebKitFeatures.cmake
+++ b/Source/cmake/WebKitFeatures.cmake
@@ -269,7 +269,7 @@ macro(WEBKIT_OPTION_END)
         endif ()
 
         option(${_name} "${_WEBKIT_AVAILABLE_OPTIONS_DESCRIPTION_${_name}}" ${_WEBKIT_AVAILABLE_OPTIONS_INITIAL_VALUE_${_name}})
-        if (NOT _WEBKIT_AVAILABLE_OPTIONS_IS_PUBLIC_${_name})
+        if (NOT ${_WEBKIT_AVAILABLE_OPTIONS_IS_PUBLIC_${_name}})
             mark_as_advanced(FORCE ${_name})
         endif ()
     endforeach ()
diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
index d7baa6b81..8879ec75a 100644
--- a/Source/cmake/WebKitMacros.cmake
+++ b/Source/cmake/WebKitMacros.cmake
@@ -364,7 +364,7 @@ endmacro()
 
 macro(MAKE_JS_FILE_ARRAYS _output_cpp _output_h _scripts _scripts_dependencies)
     if (WIN32)
-        set(_python_path set "PYTHONPATH=${JavaScriptCore_SCRIPTS_DIR}" COMMAND)
+        set(_python_path set "PYTHONPATH=${JavaScriptCore_SCRIPTS_DIR}" &&)
     else ()
         set(_python_path "PYTHONPATH=${JavaScriptCore_SCRIPTS_DIR}")
     endif ()