diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2012-01-02 18:07:43 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2012-01-02 18:07:43 (GMT) |
| commit | 131eed660716a2a8b52a6956f8e8a136425c404e (patch) | |
| tree | 99ba06a0196fc4bc6e8eb84b1ff75fc984e89b92 /Source/QtDialog/CMakeSetupDialog.cxx | |
| parent | 40aedcbbaeddcb7e088c56e30f4252171e920baa (diff) | |
| download | CMake-131eed660716a2a8b52a6956f8e8a136425c404e.zip CMake-131eed660716a2a8b52a6956f8e8a136425c404e.tar.gz CMake-131eed660716a2a8b52a6956f8e8a136425c404e.tar.bz2 | |
cmake-gui: Improve interrupt granularity to fix bug 12649.
Instead of enabling interrupt only when a progress or message callback is called, add a new callback specifically for
interrupt. This new callback is called from GetFatalErrorOccured() so cmake-gui can immediately report interrupt status
instead of calling queuing a call to cmSystemTools::SetFatalErrorOccured() and waiting for the progress or message
callback to be called to process that queued call.
Diffstat (limited to 'Source/QtDialog/CMakeSetupDialog.cxx')
| -rw-r--r-- | Source/QtDialog/CMakeSetupDialog.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index 338eaff..45b4cd3 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -554,8 +554,7 @@ void CMakeSetupDialog::doHelp() void CMakeSetupDialog::doInterrupt() { this->enterState(Interrupting); - QMetaObject::invokeMethod(this->CMakeThread->cmakeInstance(), - "interrupt", Qt::QueuedConnection); + this->CMakeThread->cmakeInstance()->interrupt(); } void CMakeSetupDialog::doSourceBrowse() |