aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Pisa <pisa@cmp.felk.cvut.cz>2019-06-27 15:14:48 +0200
committerPavel Pisa <pisa@cmp.felk.cvut.cz>2019-06-27 15:15:34 +0200
commit050f8c5574bfdb89efd2fb94f55f658962128f8c (patch)
treea28e6443ad5f2b34d31ec15bbfa27fbb5be28be1
parentb5d03465eb112661c1ec6f9f7a666f71ba24c2d6 (diff)
downloadqtmips-050f8c5574bfdb89efd2fb94f55f658962128f8c.tar.gz
qtmips-050f8c5574bfdb89efd2fb94f55f658962128f8c.tar.bz2
qtmips-050f8c5574bfdb89efd2fb94f55f658962128f8c.zip
Do not run local event loop in about dialog.
Local event loops in modal dialog prevents emscripten/WAS function correctly. Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
-rw-r--r--qtmips_gui/aboutdialog.cpp3
-rw-r--r--qtmips_gui/mainwindow.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/qtmips_gui/aboutdialog.cpp b/qtmips_gui/aboutdialog.cpp
index 71f7b8f..c14f0a8 100644
--- a/qtmips_gui/aboutdialog.cpp
+++ b/qtmips_gui/aboutdialog.cpp
@@ -51,6 +51,9 @@ AboutDialog::AboutDialog(QWidget *parent)
{
QLabel *lbl;
+ setWindowModality(Qt::WindowModal);
+ setAttribute(Qt::WA_DeleteOnClose);
+
setWindowTitle(tr("About Qt Mips"));
all = new QVBoxLayout(this);
diff --git a/qtmips_gui/mainwindow.cpp b/qtmips_gui/mainwindow.cpp
index f4473c7..cdf943d 100644
--- a/qtmips_gui/mainwindow.cpp
+++ b/qtmips_gui/mainwindow.cpp
@@ -314,7 +314,7 @@ void MainWindow::show_symbol_dialog(){
void MainWindow::about_qtmips()
{
AboutDialog *aboutdialog = new AboutDialog(this);
- aboutdialog->exec();
+ aboutdialog->show();
}
void MainWindow::about_qt()