aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-03-03 17:12:47 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2017-03-06 09:01:21 +0000
commitffc4daf0129099bb10bd0fa979be87932c067daa (patch)
treedb06575205c354ed0343927cc81747e8bbf7f432 /tests
parentf793fdbee789ecb1dcc2c4f2a2ed0cac11935e88 (diff)
Do not yet emit deprecation warnings for loadFile() and loadExtension()
This will flood our users' non-trivial projects with warnings, and fixing them will prevent the project from building with 1.7. Our approach for this kind of thing should probably be: Version x: Public announcement of deprecation Version x+1: Deprecation warning Version x+n: Removal (n == 2, if possible) Change-Id: Id04372074866259e92b92cb11e762828a1ef8efd Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/blackbox/tst_blackbox.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index b986d3c49..ef587cba4 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -3294,9 +3294,10 @@ void TestBlackbox::requireDeprecated()
{
QDir::setCurrent(testDataDir + "/require-deprecated");
QCOMPARE(runQbs(), 0);
- QVERIFY2(m_qbsStderr.contains("loadExtension() function is deprecated"),
+ // TODO: Revert conditions in 1.9
+ QVERIFY2(!m_qbsStderr.contains("loadExtension() function is deprecated"),
m_qbsStderr.constData());
- QVERIFY2(m_qbsStderr.contains("loadFile() function is deprecated"),
+ QVERIFY2(!m_qbsStderr.contains("loadFile() function is deprecated"),
m_qbsStderr.constData());
}