Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Allow qmlscene to quit immediately after starting
Useful for running tests that have no interactive element, where all
computation is performed in the initialization phase of processing
the QML source.

Change-Id: Id3f87fc504a30eb4e351804a98fe265db8fe93c9
Reviewed-by: Martin Jones <martin.jones@nokia.com>
  • Loading branch information
Matthew Vogt authored and Qt by Nokia committed Mar 21, 2012
1 parent 8dbfddf commit 9405264
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions tools/qmlscene/main.cpp
Expand Up @@ -156,6 +156,7 @@ struct Options
, clip(false)
, versionDetection(true)
, slowAnimations(false)
, quitImmediately(false)
{
}

Expand All @@ -168,6 +169,7 @@ struct Options
bool clip;
bool versionDetection;
bool slowAnimations;
bool quitImmediately;
};

#if defined(QMLSCENE_BUNDLE)
Expand Down Expand Up @@ -347,6 +349,7 @@ static void usage()
qWarning(" --no-multisample .......................... Disable multisampling (anti-aliasing)");
qWarning(" --no-version-detection .................... Do not try to detect the version of the .qml file");
qWarning(" --slow-animations ......................... Run all animations in slow motion");
qWarning(" --quit .................................... Quit immediately after starting");

qWarning(" ");
exit(1);
Expand All @@ -372,6 +375,8 @@ int main(int argc, char ** argv)
options.versionDetection = false;
else if (lowerArgument == QLatin1String("--slow-animations"))
options.slowAnimations = true;
else if (lowerArgument == QLatin1String("--quit"))
options.quitImmediately = true;
else if (lowerArgument == QLatin1String("-i") && i + 1 < argc)
imports.append(QString::fromLatin1(argv[++i]));
else if (lowerArgument == QLatin1String("--help")
Expand Down Expand Up @@ -428,6 +433,10 @@ int main(int argc, char ** argv)
else
window->show();

if (options.quitImmediately) {
QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection);
}

exitCode = app.exec();

delete window;
Expand Down

0 comments on commit 9405264

Please sign in to comment.