src/WebPage.cpp in capybara-webkit-1.14.0 vs src/WebPage.cpp in capybara-webkit-1.15.0

@@ -23,12 +23,15 @@
   m_promptAction = false;
   m_currentFrameParent = 0;
 
   setForwardUnsupportedContent(true);
   loadJavascript();
-  setUserStylesheet();
 
+  #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    setUserStylesheet();
+  #endif
+
   this->setCustomNetworkAccessManager();
 
   connect(this, SIGNAL(loadStarted()), this, SLOT(loadStarted()));
   connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
   connect(this, SIGNAL(frameCreated(QWebFrame *)),
@@ -172,11 +175,11 @@
     fullMessage = sourceID + "|" + QString::number(lineNumber) + "|" + fullMessage;
     m["source"] = sourceID;
     m["line_number"] = lineNumber;
   }
   m_consoleMessages.append(m);
-  m_manager->logger() << qPrintable(fullMessage);
+  m_manager->log() << qPrintable(fullMessage);
 }
 
 void WebPage::javaScriptAlert(QWebFrame *frame, const QString &message) {
   Q_UNUSED(frame);
   m_alertMessages.append(message);
@@ -189,11 +192,11 @@
     QRegExp expectedMessage = alertResponse["message"].toRegExp();
 
     addModalMessage(expectedType, message, expectedMessage);
   }
 
-  m_manager->logger() << "ALERT:" << qPrintable(message);
+  m_manager->log() << "ALERT:" << qPrintable(message);
 }
 
 bool WebPage::javaScriptConfirm(QWebFrame *frame, const QString &message) {
   Q_UNUSED(frame);
   m_confirmMessages.append(message);
@@ -270,13 +273,13 @@
     return message;
   else
     return message + m_errorPageMessage;
 }
 
-void WebPage::mouseEvent(QEvent::Type type, const QPoint &position, Qt::MouseButton button) {
+void WebPage::mouseEvent(QEvent::Type type, const QPoint &position, Qt::MouseButton button, Qt::KeyboardModifiers modifiers) {
   m_mousePosition = position;
-  QMouseEvent event(type, position, button, button, Qt::NoModifier);
+  QMouseEvent event(type, position, button, button, modifiers);
   QApplication::sendEvent(this, &event);
 }
 
 bool WebPage::clickTest(QWebElement element, int absoluteX, int absoluteY) {
   QPoint mousePos(absoluteX, absoluteY);
@@ -486,7 +489,5 @@
 }
 
 void WebPage::setCurrentFrameParent(QWebFrame* frame) {
   m_currentFrameParent = frame;
 }
-
-