Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	configure.exe
	src/network/access/qhttpnetworkconnection_p.h
	tests/auto/qstyle/qstyle.pro
	tests/auto/qstyle/tst_qstyle.cpp
	tools/configure/configureapp.cpp

configure.exe will be recompiled in next commit. Took ours.

1 files changed, 341 insertions, 0 deletions

diff --git a/tests/auto/linguist/lconvert/tst_lconvert.cpp b/tests/auto/linguist/lconvert/tst_lconvert.cpp
new file mode 100644
index 0000000..40be55a
--- /dev/null
+++ b/tests/auto/linguist/lconvert/tst_lconvert.cpp
@@ -0,0 +1,341 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtCore/QFile>
+
+class tst_lconvert : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_lconvert() : dataDir("data/") {}
+
+private slots:
+    void initTestCase();
+    void readverifies_data();
+    void readverifies();
+    void converts_data();
+    void converts();
+    void roundtrips_data();
+    void roundtrips();
+#if 0
+    void chains_data();
+    void chains();
+#endif
+
+private:
+    void doWait(QProcess *cvt, int stage);
+    void doCompare(QIODevice *actual, const QString &expectedFn);
+    void verifyReadFail(const QString &fn);
+    // args can be empty or have one element less than stations
+    void convertChain(const QString &inFileName, const QString &outFileName,
+            const QStringList &stations, const QList<QStringList> &args);
+    void convertRoundtrip(const QString &fileName, const QStringList &stations,
+            const QList<QStringList> &args);
+
+    QString dataDir;
+};
+
+void tst_lconvert::initTestCase()
+{
+    if (!QFile::exists(QLatin1String("data/plural-1.po")))
+        QProcess::execute(QLatin1String("data/makeplurals.sh"), QStringList() << QLatin1String("data/"));
+    QVERIFY(QFile::exists(QLatin1String("data/plural-1.po")));
+}
+
+void tst_lconvert::doWait(QProcess *cvt, int stage)
+{
+    if (QTest::currentTestFailed()) {
+        cvt->kill();
+        cvt->waitForFinished();
+    } else {
+        QVERIFY2(cvt->waitForFinished(3000),
+                 qPrintable(QString("Process %1 hung").arg(stage)));
+        QVERIFY2(cvt->exitStatus() == QProcess::NormalExit,
+                 qPrintable(QString("Process %1 crashed").arg(stage)));
+        QVERIFY2(cvt->exitCode() == 0,
+                 qPrintable(QString("Process %1 exited with status %2. Errors:\n%3")
+                            .arg(stage).arg(cvt->exitCode())
+                            .arg(QString::fromUtf8(cvt->readAllStandardError()))));
+    }
+}
+
+void tst_lconvert::doCompare(QIODevice *actualDev, const QString &expectedFn)
+{
+    QList<QByteArray> actual = actualDev->readAll().split('\n');
+
+    QFile file(expectedFn);
+    QVERIFY(file.open(QIODevice::ReadOnly));
+    QList<QByteArray> expected = file.readAll().split('\n');
+
+    int i = 0, ei = expected.size(), gi = actual.size();
+    for (; ; i++) {
+        if (i == gi) {
+            if (i == ei)
+                return;
+            gi = 0;
+            break;
+        } else if (i == ei) {
+            ei = 0;
+            break;
+        } else if (actual.at(i) != expected.at(i)) {
+            while ((ei - 1) >= i && (gi - 1) >= i && actual.at(gi - 1) == expected.at(ei - 1))
+                ei--, gi--;
+            break;
+        }
+    }
+    QByteArray diff;
+    for (int j = qMax(0, i - 3); j < i; j++)
+        diff += expected.at(j) + '\n';
+    diff += "<<<<<<< got\n";
+    for (int j = i; j < gi; j++) {
+        diff += actual.at(j) + '\n';
+        if (j >= i + 5) {
+            diff += "...\n";
+            break;
+        }
+    }
+    diff += "=========\n";
+    for (int j = i; j < ei; j++) {
+        diff += expected.at(j) + '\n';
+        if (j >= i + 5) {
+            diff += "...\n";
+            break;
+        }
+    }
+    diff += ">>>>>>> expected\n";
+    for (int j = ei; j < qMin(ei + 3, expected.size()); j++)
+        diff += expected.at(j) + '\n';
+    QFAIL(qPrintable("Output for " + expectedFn + " does not meet expectations:\n" + diff));
+}
+
+void tst_lconvert::verifyReadFail(const QString &fn)
+{
+    QProcess cvt;
+    cvt.start("lconvert", QStringList() << (dataDir + fn));
+    QVERIFY(cvt.waitForFinished(1000));
+    QVERIFY(cvt.exitStatus() == QProcess::NormalExit);
+    QVERIFY2(cvt.exitCode() == 2, "Accepted invalid input");
+}
+
+void tst_lconvert::convertChain(const QString &_inFileName, const QString &_outFileName,
+    const QStringList &stations, const QList<QStringList> &argList)
+{
+    QList<QProcess *> cvts;
+
+    QString fileName = dataDir + _inFileName;
+    QString outFileName = dataDir + _outFileName;
+
+    for (int i = 0; i < stations.size() - 1; i++) {
+        QProcess *cvt = new QProcess(this);
+        if (cvts.isEmpty())
+            cvt->setStandardInputFile(fileName);
+        else
+            cvts.last()->setStandardOutputProcess(cvt);
+        cvts.append(cvt);
+    }
+    for (int i = 0; i < stations.size() - 1; i++) {
+        QStringList args;
+        if (!argList.isEmpty())
+            args += argList[i];
+        args << "-if" << stations[i] << "-i" << "-" << "-of" << stations[i + 1];
+        cvts.at(i)->start("lconvert", args);
+    }
+    int st = 0;
+    foreach (QProcess *cvt, cvts)
+        doWait(cvt, ++st);
+
+    if (!QTest::currentTestFailed())
+        doCompare(cvts.last(), outFileName);
+
+    qDeleteAll(cvts);
+}
+
+void tst_lconvert::convertRoundtrip(const QString &_fileName, const QStringList &stations,
+    const QList<QStringList> &argList)
+{
+    convertChain(_fileName, _fileName, stations, argList);
+}
+
+void tst_lconvert::readverifies_data()
+{
+    QTest::addColumn<QString>("fileName");
+    QTest::addColumn<QString>("format");
+
+    QTest::newRow("empty comment") << "test-empty-comment.po" << "po";
+    QTest::newRow("translator comment") << "test-translator-comment.po" << "po";
+    QTest::newRow("developer comment") << "test-developer-comment.po" << "po";
+    QTest::newRow("kde context") << "test-kde-ctxt.po" << "po";
+    QTest::newRow("kde fuzzy") << "test-kde-fuzzy.po" << "po";
+    QTest::newRow("kde plurals") << "test-kde-plurals.po" << "po";
+    QTest::newRow("kde multiline") << "test-kde-multiline.po" << "po";
+    QTest::newRow("po linewrapping") << "wrapping.po" << "po";
+    QTest::newRow("relative locations") << "relative.ts" << "ts";
+    QTest::newRow("message ids") << "msgid.ts" << "ts";
+    QTest::newRow("length variants") << "variants.ts" << "ts";
+}
+
+void tst_lconvert::readverifies()
+{
+    QFETCH(QString, fileName);
+    QFETCH(QString, format);
+
+    convertRoundtrip(fileName, QStringList() << format << format, QList<QStringList>());
+}
+
+void tst_lconvert::converts_data()
+{
+    QTest::addColumn<QString>("inFileName");
+    QTest::addColumn<QString>("outFileName");
+    QTest::addColumn<QString>("format");
+
+    QTest::newRow("broken utf8") << "test-broken-utf8.po" << "test-broken-utf8.po.out" << "po";
+    QTest::newRow("line joins") << "test-slurp.po" << "test-slurp.po.out" << "po";
+    QTest::newRow("escapes") << "test-escapes.po" << "test-escapes.po.out" << "po";
+}
+
+void tst_lconvert::converts()
+{
+    QFETCH(QString, inFileName);
+    QFETCH(QString, outFileName);
+    QFETCH(QString, format);
+
+    QString outFileNameFq = dataDir + outFileName;
+
+    QProcess cvt;
+    cvt.start("lconvert", QStringList() << "-i" << (dataDir + inFileName) << "-of" << format);
+    doWait(&cvt, 0);
+    if (QTest::currentTestFailed())
+        return;
+
+    doCompare(&cvt, outFileNameFq);
+}
+
+Q_DECLARE_METATYPE(QList<QStringList>);
+
+#if 0
+void tst_lconvert::chains_data()
+{
+    QTest::addColumn<QString>("inFileName");
+    QTest::addColumn<QString>("outFileName");
+    QTest::addColumn<QStringList>("stations");
+    QTest::addColumn<QList<QStringList> >("args");
+
+}
+
+void tst_lconvert::chains()
+{
+    QFETCH(QString, inFileName);
+    QFETCH(QString, outFileName);
+    QFETCH(QStringList, stations);
+    QFETCH(QList<QStringList>, args);
+
+    convertChain(inFileName, outFileName, stations, args);
+}
+#endif
+
+void tst_lconvert::roundtrips_data()
+{
+    QTest::addColumn<QString>("fileName");
+    QTest::addColumn<QStringList>("stations");
+    QTest::addColumn<QList<QStringList> >("args");
+
+    QStringList poTsPo; poTsPo << "po" << "ts" << "po";
+    QStringList poXlfPo; poXlfPo << "po" << "xlf" << "po";
+    QStringList tsTs11Ts; tsTs11Ts << "ts" << "ts11" << "ts";
+    QStringList tsPoTs; tsPoTs << "ts" << "po" << "ts";
+    QStringList ts11PoTs11; ts11PoTs11 << "ts11" << "po" << "ts11";
+    QStringList tsXlfTs; tsXlfTs << "ts" << "xlf" << "ts";
+    QStringList tsQmTs; tsQmTs << "ts" << "qm" << "ts";
+
+    QList<QStringList> noArgs;
+    QList<QStringList> filterPoArgs; filterPoArgs << QStringList() << (QStringList() << "-drop-tag" << "po:*");
+    QList<QStringList> outDeArgs; outDeArgs << QStringList() << (QStringList() << "-target-language" << "de");
+    QList<QStringList> outCnArgs; outCnArgs << QStringList() << (QStringList() << "-target-language" << "cn");
+
+    QTest::newRow("po-ts-po (translator comment)") << "test-translator-comment.po" << poTsPo << noArgs;
+    QTest::newRow("po-xliff-po (translator comment)") << "test-translator-comment.po" << poXlfPo << noArgs;
+    QTest::newRow("po-ts-po (developer comment)") << "test-developer-comment.po" << poTsPo << noArgs;
+    QTest::newRow("po-xliff-po (developer comment)") << "test-developer-comment.po" << poXlfPo << noArgs;
+
+    QTest::newRow("ts11-po-ts11") << "test11.ts" << ts11PoTs11 << filterPoArgs;
+    QTest::newRow("ts20-po-ts20") << "test20.ts" << tsPoTs << filterPoArgs;
+    QTest::newRow("po-ts-po (de)") << "test1-de.po" << poTsPo << noArgs;
+    QTest::newRow("po-ts-po (cn)") << "test1-cn.po" << poTsPo << noArgs;
+    QTest::newRow("po-xliff-po (de)") << "test1-de.po" << poXlfPo << noArgs;
+    QTest::newRow("po-xliff-po (cn)") << "test1-cn.po" << poXlfPo << noArgs;
+
+    QTest::newRow("po-ts-po (singular)") << "singular.po" << poTsPo << noArgs;
+    QTest::newRow("po-ts-po (plural-1)") << "plural-1.po" << poTsPo << noArgs;
+    QTest::newRow("po-ts-po (plural-2)") << "plural-2.po" << poTsPo << noArgs;
+    QTest::newRow("po-ts-po (plural-3)") << "plural-3.po" << poTsPo << noArgs;
+    QTest::newRow("po-xliff-po (singular)") << "singular.po" << poXlfPo << noArgs;
+    QTest::newRow("po-xliff-po (plural-1)") << "plural-1.po" << poXlfPo << noArgs;
+    QTest::newRow("po-xliff-po (plural-2)") << "plural-2.po" << poXlfPo << noArgs;
+    QTest::newRow("po-xliff-po (plural-3)") << "plural-3.po" << poXlfPo << noArgs;
+
+    QTest::newRow("ts20-ts11-ts20 (utf8)") << "codec-utf8.ts" << tsTs11Ts << noArgs;
+    QTest::newRow("ts20-ts11-ts20 (cp1252)") << "codec-cp1252.ts" << tsTs11Ts << noArgs;
+    QTest::newRow("ts20-ts11-ts20 (dual-encoding)") << "dual-encoding.ts" << tsTs11Ts << noArgs;
+
+    QTest::newRow("ts-qm-ts (dual-encoding)") << "dual-encoding.ts" << tsQmTs << noArgs;
+    QTest::newRow("ts-qm-ts (plurals-de)") << "plurals-de.ts" << tsQmTs << outDeArgs;
+    QTest::newRow("ts-qm-ts (plurals-cn)") << "plurals-cn.ts" << tsQmTs << outCnArgs;
+    QTest::newRow("ts-qm-ts (variants)") << "variants.ts" << tsQmTs << outDeArgs;
+    QTest::newRow("ts-po-ts (msgid)") << "msgid.ts" << tsPoTs << noArgs;
+    QTest::newRow("ts-xliff-ts (msgid)") << "msgid.ts" << tsXlfTs << noArgs;
+
+    QTest::newRow("ts-po-ts (endless loop)") << "endless-po-loop.ts" << tsPoTs << noArgs;
+}
+
+void tst_lconvert::roundtrips()
+{
+    QFETCH(QString, fileName);
+    QFETCH(QStringList, stations);
+    QFETCH(QList<QStringList>, args);
+
+    convertRoundtrip(fileName, stations, args);
+}
+
+QTEST_APPLESS_MAIN(tst_lconvert)
+
+#include "tst_lconvert.moc"