diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-16 15:21:20 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-21 14:43:21 +0200 |
commit | 94ab2efb2d155d3c1ca7b91c1daf443a149bcf1f (patch) | |
tree | a47acf24fe90a7c7ecb06b0bf01d0ca7ca7098d4 /tests | |
parent | fb38f74b7e0b62cf5298f1a76e83fec008995156 (diff) | |
download | qttools-94ab2efb2d155d3c1ca7b91c1daf443a149bcf1f.tar.gz |
make stubs for dangerous/useless qmake functions in limited mode
instead of having them "not implemented" (and consequently getting
errors), just let requires(), system(), mkpath(), write_file(), touch()
and cache() do nothing. this is likely to cause followup failures which
are harder to detect, but the amount of scary noise we are producing now
is not really acceptable. furthermore, in qtcreator these failures
actually terminate the "precise" evaluation, which breaks Run
Configurations.
Task-number: QTBUG-28159
Task-number: QTCREATORBUG-8550 (in different repo)
Change-Id: I1bdeb759e895e4200f09332dadf8a6cef348182f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/linguist/lupdate/tst_lupdate.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp index 34133806b..2e6838371 100644 --- a/tests/auto/linguist/lupdate/tst_lupdate.cpp +++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp @@ -122,19 +122,12 @@ static bool prepareMatch(const QString &expect, QString *tmpl, int *require, int return true; } -void tst_lupdate::doCompare(const QStringList &_actual, const QString &expectedFn, bool err) +void tst_lupdate::doCompare(const QStringList &actual, const QString &expectedFn, bool err) { QFile file(expectedFn); QVERIFY2(file.open(QIODevice::ReadOnly | QIODevice::Text), qPrintable(expectedFn)); QStringList expected = QString(file.readAll()).split('\n'); - QStringList actual; - actual.reserve(_actual.size()); - QRegExp niRx(".*:(Function '\\w+' is not implemented|'\\w+' is not a recognized replace function)"); - foreach (const QString &a, _actual) - if (!niRx.exactMatch(a)) - actual << a; - int ei = 0, ai = 0, em = expected.size(), am = actual.size(); int oei = 0, oai = 0, oem = em, oam = am; int require = 0, accept = 0; |