aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2021-10-18 20:42:35 +0300
committerIvan Komissarov <ABBAPOH@gmail.com>2021-10-23 16:54:39 +0000
commit14248956d671d92c9cc23e6d147422b92c039912 (patch)
tree766bdc91c2d275eb0f029a4df875a57eece29aab /tests/auto
parent1da9e15a52caecec0fb4292ab62abbe7f6e2de1f (diff)
Use unique_ptr for managing ScriptEngines
Change-Id: I89f510619196cc01a9e3b0c2273888b12b188928 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/language/tst_language.cpp8
-rw-r--r--tests/auto/language/tst_language.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp
index da3eb417f..cdcff99bd 100644
--- a/tests/auto/language/tst_language.cpp
+++ b/tests/auto/language/tst_language.cpp
@@ -175,8 +175,8 @@ void TestLanguage::init()
void TestLanguage::initTestCase()
{
m_logger = Logger(m_logSink);
- m_engine = ScriptEngine::create(m_logger, EvalContext::PropertyEvaluation, this);
- loader = new Loader(m_engine, m_logger);
+ m_engine = ScriptEngine::create(m_logger, EvalContext::PropertyEvaluation);
+ loader = new Loader(m_engine.get(), m_logger);
loader->setSearchPaths(QStringList()
<< (testDataDir() + "/../../../../share/qbs"));
defaultParameters.setTopLevelProfile(profileName());
@@ -1602,7 +1602,7 @@ void TestLanguage::itemPrototype()
item->setProperty("y", sourceValueCreator.create("x + 1"));
item->setProperty("z", sourceValueCreator.create("2"));
- Evaluator evaluator(m_engine);
+ Evaluator evaluator(m_engine.get());
QCOMPARE(evaluator.property(proto, "x").toVariant().toInt(), 1);
QCOMPARE(evaluator.property(proto, "y").toVariant().toInt(), 1);
QVERIFY(!evaluator.property(proto, "z").isValid());
@@ -1626,7 +1626,7 @@ void TestLanguage::itemScope()
item->setScope(scope2);
item->setProperty("z", sourceValueCreator.create("x + y"));
- Evaluator evaluator(m_engine);
+ Evaluator evaluator(m_engine.get());
QCOMPARE(evaluator.property(scope1, "x").toVariant().toInt(), 1);
QCOMPARE(evaluator.property(scope2, "y").toVariant().toInt(), 2);
QVERIFY(!evaluator.property(scope2, "x").isValid());
diff --git a/tests/auto/language/tst_language.h b/tests/auto/language/tst_language.h
index 7e521c05b..4fe2752e4 100644
--- a/tests/auto/language/tst_language.h
+++ b/tests/auto/language/tst_language.h
@@ -60,7 +60,7 @@ private:
qbs::ILogSink *m_logSink;
qbs::Settings * const m_settings;
qbs::Internal::Logger m_logger;
- qbs::Internal::ScriptEngine *m_engine;
+ std::unique_ptr<qbs::Internal::ScriptEngine> m_engine;
qbs::Internal::Loader *loader;
qbs::Internal::TopLevelProjectPtr project;
qbs::SetupProjectParameters defaultParameters;