Merge "[ui] Make the error dialog modal." into emu-master-dev

Evan Birenbaum · Gerrit Code Review · commit f668758ba2e1 · 2016-02-01T21:44:41.000Z
diff --git a/android/skin/qt/error-dialog.cpp b/android/skin/qt/error-dialog.cpp
@@ -15,6 +15,7 @@
 void showErrorDialog(const QString& message, const QString& title)
 {
     QErrorMessage *err = QErrorMessage::qtHandler();
+    err->setModal(true);
     err->setWindowTitle(title);
     err->showMessage(message);
 }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`void showErrorDialog(const QString& message, const QString& title)`
`16`	`16`	`{`
`17`	`17`	`QErrorMessage *err = QErrorMessage::qtHandler();`
	`18`	`+ err->setModal(true);`
`18`	`19`	`err->setWindowTitle(title);`
`19`	`20`	`err->showMessage(message);`
`20`	`21`	`}`