summaryrefslogtreecommitdiffstats
path: root/tests/auto/installer/scriptengine
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@theqtcompany.com>2016-01-21 08:35:26 +0100
committerKarsten Heimrich <karsten.heimrich@theqtcompany.com>2016-01-21 13:55:26 +0000
commitd2e0b8fc3b6f144db21c2989dd73aadc30443114 (patch)
tree5b2e9349acb89e208b83810cbb13cdd29bb8a429 /tests/auto/installer/scriptengine
parent7e9dd07b7addcbe0565dc262f06cee281d6d62b6 (diff)
Fix build after merge.
Change-Id: I03b7f65e9a2b5ce16160f9059e70a064e354a6c7 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'tests/auto/installer/scriptengine')
-rw-r--r--tests/auto/installer/scriptengine/tst_scriptengine.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
index df8d1a8b7..48223a821 100644
--- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp
+++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
@@ -33,7 +33,8 @@
#include <component.h>
#include <errors.h>
-#include <kdupdaterupdateoperationfactory.h>
+#include <updateoperation.h>
+#include <updateoperationfactory.h>
#include <packagemanagercore.h>
#include <packagemanagergui.h>
#include <scriptengine.h>
@@ -160,7 +161,9 @@ signals:
class EmptyArgOperation : public KDUpdater::UpdateOperation
{
public:
- EmptyArgOperation() {
+ explicit EmptyArgOperation(QInstaller::PackageManagerCore *core)
+ : KDUpdater::UpdateOperation(core)
+ {
setName("EmptyArg");
}
@@ -174,9 +177,6 @@ public:
bool testOperation() {
return true;
}
- UpdateOperation *clone() const {
- return 0;
- }
};
@@ -281,7 +281,7 @@ private slots:
// ignore Output from script
setExpectedScriptOutput("function receive()");
- QTest::ignoreMessage(QtWarningMsg, ":10: ReferenceError: foo is not defined");
+ QTest::ignoreMessage(QtWarningMsg, ":43: ReferenceError: foo is not defined");
emiter.produceSignal();
const QJSValue value = m_scriptEngine->evaluate("");