aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@theqtcompany.com>2015-08-07 11:02:13 +0200
committerMitch Curtis <mitch.curtis@theqtcompany.com>2015-08-07 10:31:08 +0000
commitf85da563f6a7a307b40ec6abd93e28de3793aa02 (patch)
treeefb3d8db7c76ccfb09332d1df7c0548adc334207 /tests
parent1c911f1a7e8bab144a844f868dac280533dad3f1 (diff)
GitRecorder: don't warn on empty outputFileName.
If it's empty, we generate it for the user. Change-Id: I4f02fcd603eb0c3c4ebba4838bcbd45f20ad6414 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/manual/gifs/gifrecorder.cpp7
-rw-r--r--tests/manual/gifs/tst_gifs.cpp3
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/manual/gifs/gifrecorder.cpp b/tests/manual/gifs/gifrecorder.cpp
index e684181c..7df35548 100644
--- a/tests/manual/gifs/gifrecorder.cpp
+++ b/tests/manual/gifs/gifrecorder.cpp
@@ -89,7 +89,6 @@ void GifRecorder::setOutputDir(const QDir &dir)
void GifRecorder::setOutputFileName(const QString &fileName)
{
- QVERIFY2(!fileName.isEmpty(), "Output file name cannot be empty");
mOutputFileName = fileName;
}
@@ -119,8 +118,10 @@ void GifRecorder::start()
mView->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(mView, 500));
- mOutputFileName = mOutputDir.absoluteFilePath(mQmlInputFileName);
- mOutputFileName.replace(".qml", ".gif");
+ if (mOutputFileName.isEmpty()) {
+ mOutputFileName = mOutputDir.absoluteFilePath(mQmlInputFileName);
+ mOutputFileName.replace(".qml", ".gif");
+ }
QStringList args;
args << "-d" << QString::number(mRecordingDuration) << "-v";
diff --git a/tests/manual/gifs/tst_gifs.cpp b/tests/manual/gifs/tst_gifs.cpp
index babf143a..f61f609f 100644
--- a/tests/manual/gifs/tst_gifs.cpp
+++ b/tests/manual/gifs/tst_gifs.cpp
@@ -78,7 +78,6 @@ void tst_Gifs::tumblerWrap()
gifRecorder.setOutputDir(outputDir);
gifRecorder.setRecordingDuration(4);
gifRecorder.setQmlFileName("qtquickextras2-tumbler-wrap.qml");
- gifRecorder.setOutputFileName("wrap.gif");
gifRecorder.setView(&view);
view.show();
@@ -151,8 +150,6 @@ void tst_Gifs::slider()
gifRecorder.setOutputDir(outputDir);
gifRecorder.setRecordingDuration(3);
gifRecorder.setQmlFileName("qtquickcontrols2-slider.qml");
- // TODO: default to replacing .qml with .gif if outputFileName is empty.
- gifRecorder.setOutputFileName("qtquickcontrols2-slider.gif");
gifRecorder.setView(&view);
view.show();