diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 12:48:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 12:48:06 +0100 |
| commit | 5d150f63e1a188414e4951c4b6e4c7c474d9b4e6 (patch) | |
| tree | d249fdfd8480b367ad238b62602f48254dceda11 /tools | |
| parent | 63064c7ed7a23c1749ed7f58d55b680190dc01c4 (diff) | |
| parent | ef92d6f8ef649fdaf50c123c6ca978b6db6892f6 (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/qml/qml/parser/qqmljskeywords_p.h
sync.profile
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
Change-Id: I9bc6659e1bab924009167bec567354d40a77a8cb
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 2 | ||||
| -rw-r--r-- | tools/qmlscene/main.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
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 diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index a90870aa0b..1121f02dba 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -476,7 +476,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; } |