Commit 23558d5e authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

We depend against qt5.15

parent 2953f7d7
......@@ -449,11 +449,7 @@ void AnalitzaTest::testCorrection_data()
<< QStringLiteral("pu:=n->sum( comb(n,i)*p^(n-i)*(1-p)*sum(x:x=0..i) :i=0..(floor((n-1)/2)))")
<< QStringLiteral("pu(5)");
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) && QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
QTest::newRow("bug241047") << script << "2.97495e-5";
#else
QTest::newRow("bug241047") << script << "2.97495e-05";
#endif
script.clear();
script << QStringLiteral("comb:=(n, i)->factorial(n)/(factorial(i)*factorial(n-i))")
......
......@@ -164,11 +164,7 @@ void PlotsView2D::wheelEvent(QWheelEvent *e)
qreal d = (-0.03*steps) + 1;
if(d>0 || (viewport.width()+d > 2 && viewport.height()+d < 2)) {
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
scaleViewport(d, e->pos());
#else
scaleViewport(d, e->position().toPoint());
#endif
}
}
......
......@@ -36,9 +36,5 @@ void AnalitzaDeclarativePlugin::registerTypes(const char* uri)
qmlRegisterType<Analitza::VariablesModel>(uri, 1, 0, "VariablesModel");
qmlRegisterType<OperatorsModel>(uri, 1, 0, "OperatorsModel");
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
qmlRegisterInterface<Analitza::Variables*>("Analitza::Variables");
#else
qmlRegisterInterface<Analitza::Variables>(uri, 1);
#endif
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment