diff --git a/COPYING b/COPYING index 2fcb217..caeca07 120000 --- a/COPYING +++ b/COPYING @@ -1 +1 @@ -/usr/share/automake-1.13/COPYING \ No newline at end of file +/usr/share/automake-1.14/COPYING \ No newline at end of file diff --git a/INSTALL b/INSTALL index 8b641e3..f812f5a 120000 --- a/INSTALL +++ b/INSTALL @@ -1 +1 @@ -/usr/share/automake-1.13/INSTALL \ No newline at end of file +/usr/share/automake-1.14/INSTALL \ No newline at end of file diff --git a/configure.ac b/configure.ac index 6e6f920..cc9a4ae 100644 --- a/configure.ac +++ b/configure.ac @@ -34,8 +34,7 @@ export QT_SELECT=5 AC_SUBST(QT_SELECT) # qt features -AX_REQUIRE_QT([QT], [QtCore QtGui QtNetwork QtWebKit], - [QtWidgets QtWebKitWidgets]) +AX_REQUIRE_QT([QT], [QtCore QtGui QtNetwork QtWebKit], [QtWidgets QtWebKitWidgets]) AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_KEYWORDS" # libraries used diff --git a/src/commands.hxx b/src/commands.hxx index 5d7bad9..70c7dc1 100644 --- a/src/commands.hxx +++ b/src/commands.hxx @@ -1508,16 +1508,16 @@ class Exists: public Command { QString selector(script->replacevars(_selector)); QString text(script->replacevars(_text)); QStringList notfound; + QWebElement firstelement(find(frame, selector)); Q_FOREACH(QWebElement element, frame->findAllElements(selector)) { if (text.isEmpty()) return true; // just find element if (element.toOuterXml().indexOf(text)!=-1) return true; if (element.toPlainText().indexOf(text)!=-1) return true; notfound += element.toOuterXml(); } - QWebElement element(find(frame, selector)); if (text.isEmpty()) error(log, AssertionFailed("element not found: "+selector)); - else if (element.isNull()) + else if (firstelement.isNull()) error(log, AssertionFailed("expected \""+text+"\" in non existing element " +selector)); else