From 0af3c34aa6d80581f59ceb8a5fb8fcb6d3e95dd9 Mon Sep 17 00:00:00 2001
From: Joe Ferris <jferris@thoughtbot.com>
Date: Thu, 14 Apr 2016 10:26:08 -0400
Subject: [PATCH] Allow Qt 5.6 with QtWebKit module

If users compiled or otherwise installed the webkit module, this allows
them to use capybara-webkit with Qt 5.6.

If they're using Qt 5.6 but don't have the module, this prints a
friendlier error message.
---
 src/webkit_server.pro     | 9 +++++----
 test/testwebkitserver.pro | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/webkit_server.pro b/src/webkit_server.pro
index b7d2e7e..50b1d61 100644
--- a/src/webkit_server.pro
+++ b/src/webkit_server.pro
@@ -176,10 +176,11 @@ SOURCES = \
 RESOURCES = webkit_server.qrc
 QT += network
 greaterThan(QT_MAJOR_VERSION, 4) {
-  greaterThan(QT_MAJOR_VERSION, 5) | greaterThan(QT_MINOR_VERSION, 5) {
-    error(capybara-webkit does not support Qt versions greater than 5.5)
-  }
-  QT += webkitwidgets
+  qtHaveModule(webkitwidgets) {
+    QT += webkitwidgets
+   } else {
+      error("No QtWebKit installation found. QtWebKit is no longer included with Qt 5.6, so you may need to install it separately.")
+   }
 } else {
   QT += webkit
 }
diff --git a/test/testwebkitserver.pro b/test/testwebkitserver.pro
index 721bd84..0908990 100644
--- a/test/testwebkitserver.pro
+++ b/test/testwebkitserver.pro
@@ -1,5 +1,5 @@
 SOURCES = testignoredebugoutput.cpp
-OBJECTS += ../src/IgnoreDebugOutput.o
+OBJECTS += ../src/build/IgnoreDebugOutput.o
 QT += testlib
 CONFIG += testcase console
 CONFIG -= app_bundle