From 425260c2b2a60c0c145a5e76a3b7835eadd0fd0d Mon Sep 17 00:00:00 2001 From: Alan Alpert <416365416c@gmail.com> Date: Thu, 6 Dec 2012 14:17:47 -0800 Subject: Change qFatal to qWarning While the process should terminate immediately with a non-zero exit code on component error, it does that in the next line already. The main difference is dropping the backtrace, which is not useful in this case. Change-Id: I866ea00e62cb9d1b7c506b9819cd9bb2750ac81f Reviewed-by: Jens Bache-Wiig --- tools/qmlscene/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 87a577b44e..6a0d04beda 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -472,7 +472,7 @@ int main(int argc, char ** argv) QObject::connect(&engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit())); component->loadUrl(options.file); if ( !component->isReady() ) { - qFatal("%s", qPrintable(component->errorString())); + qWarning("%s", qPrintable(component->errorString())); return -1; } -- cgit v1.2.3 From 585bce863f4dd4b169111b2af11e50ba9fece92a Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 12 Dec 2012 13:28:28 +0200 Subject: Add minimal plugin importing to quick2 qmlplugindump tool Task-number: QTBUG-28131 Change-Id: Iad55e3c6057b060cd8f8233e02a6151c91cc32ed Reviewed-by: Oswald Buddenhagen --- tools/qmlplugindump/qmlplugindump.pro | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tools') diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index f0cc1bf103..b777e0da75 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -1,5 +1,7 @@ QT += qml qml-private quick-private core-private +CONFIG += qpa_minimal_plugin + SOURCES += \ main.cpp \ qmlstreamwriter.cpp -- cgit v1.2.3