diff options
Diffstat (limited to 'tests/auto/tools/uic/tst_uic.cpp')
| -rw-r--r-- | tests/auto/tools/uic/tst_uic.cpp | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/tests/auto/tools/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp index 42c8e3e7b9..cf43cb02d3 100644 --- a/tests/auto/tools/uic/tst_uic.cpp +++ b/tests/auto/tools/uic/tst_uic.cpp @@ -1,31 +1,26 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** -** 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 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, 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 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -147,10 +142,11 @@ void tst_uic::run() { QFETCH(QString, originalFile); QFETCH(QString, generatedFile); + QFETCH(QStringList, options); QProcess process; process.start(m_command, QStringList(originalFile) - << QString(QLatin1String("-o")) << generatedFile); + << QString(QLatin1String("-o")) << generatedFile << options); QVERIFY2(process.waitForStarted(), msgProcessStartFailed(m_command, process.errorString())); QVERIFY(process.waitForFinished()); QCOMPARE(process.exitStatus(), QProcess::NormalExit); @@ -162,6 +158,7 @@ void tst_uic::run_data() const { QTest::addColumn<QString>("originalFile"); QTest::addColumn<QString>("generatedFile"); + QTest::addColumn<QStringList>("options"); QDir generated(m_generated.path()); QDir baseline(m_baseline); @@ -170,9 +167,15 @@ void tst_uic::run_data() const const QString generatedFile = generated.absolutePath() + QLatin1Char('/') + baselineFile.fileName() + QLatin1String(".h"); + + QStringList options; + if (baselineFile.fileName() == QLatin1String("qttrid.ui")) + options << QStringList(QLatin1String("-idbased")); + QTest::newRow(qPrintable(baselineFile.baseName())) << baselineFile.absoluteFilePath() - << generatedFile; + << generatedFile + << options; } } |