diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-09-28 08:52:19 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-09-28 08:52:19 (GMT) |
| commit | 3b05cb4597df0f8b2c09cae5e4bb8766caaaf653 (patch) | |
| tree | a993c171f46623539eae8f91facbae95014f0aa5 | |
| parent | 746954581f06e0bca98f25eb95dca09c663d47bf (diff) | |
| parent | cf4c64a8f155c179f51d2cddd81bae4701826871 (diff) | |
| download | Qt-3b05cb4597df0f8b2c09cae5e4bb8766caaaf653.zip Qt-3b05cb4597df0f8b2c09cae5e4bb8766caaaf653.tar.gz Qt-3b05cb4597df0f8b2c09cae5e4bb8766caaaf653.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | tools/qml/main.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 78cd64d..00d43c1 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -89,6 +89,9 @@ QString warnings; void showWarnings() { if (!warnings.isEmpty()) { + int argc = 0; char **argv = 0; + QApplication application(argc, argv); // QApplication() in main has been destroyed already. + Q_UNUSED(application) QMessageBox::warning(0, QApplication::tr("Qt QML Viewer"), warnings); } } @@ -516,7 +519,7 @@ int main(int argc, char ** argv) #if defined (Q_OS_WIN) // Debugging output is not visible by default on Windows - - // therefore show modal dialog with errors instad. + // therefore show modal dialog with errors instead. atexit(showWarnings); #endif |