qtwebkit2.3-windowsbuild.diff

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 4d6e7c4..176ee88 100755
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1569,7 +1569,7 @@ sub checkRequiredSystemConfig
         }
         my @missing = ();
         my $oldPath = $ENV{PATH};
-        if (isQt() and isWindows()) {
+        if (isQt() and isWindows() and $qtMajorVersion == 5) {
             chomp(my $gnuWin32Dir = `$qmakebin -query QT_HOST_DATA`);
             $gnuWin32Dir = File::Spec->catfile($gnuWin32Dir, "..", "gnuwin32", "bin");
             if (-d "$gnuWin32Dir") {
diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
index 5dd1a90..473297d 100644
--- a/Tools/qmake/mkspecs/features/default_post.prf
+++ b/Tools/qmake/mkspecs/features/default_post.prf
@@ -89,7 +89,7 @@ contains(TEMPLATE, derived) {
     # on Linux and Mac OS X. On Windows we do have a convenience copy in
     # Qt5's top-level repository, so let's add that to the PATH if we can
     # find it.
-    win32 {
+    haveQt(5):win32 {
         GNUTOOLS_DIR=$$[QT_HOST_DATA]/../gnuwin32/bin
         exists($$GNUTOOLS_DIR/gperf.exe) {
             GNUTOOLS = "(set $$escape_expand(\\\")PATH=$$toSystemPath($$GNUTOOLS_DIR);%PATH%$$escape_expand(\\\"))"