Merge remote-tracking branch 'upstream/master'

2013-10-09 19:38:48 +01:00 · 2013-10-09 19:38:48 +01:00 · a37dde48e0
commit a37dde48e0
parent fb7d864cd0 1055dc1016
2 changed files with 6 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -1,3 +1,5 @@
+_I am looking for a new maintainer for this project. Please contact me via GitHub if you're interested._
+
 # Jasmine Headless WebKit runner

 Run your specs at sonic boom speed! No pesky reload button or page rendering slowdowns!
--- a/ext/jasmine-webkit-specrunner/specrunner.cpp
+++ b/ext/jasmine-webkit-specrunner/specrunner.cpp
@ -23,6 +23,10 @@

 #include "Runner.h"

+#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
+#include <getopt.h>
+#endif
+
 #if QT_VERSION < QT_VERSION_CHECK(4, 7, 0)
 #error Use Qt 4.7 or later version
 #endif