diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-09 20:11:47 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-09 20:11:47 (GMT) |
| commit | ebd0c2d3771835a1317c1fd70eafd3ebf2135b01 (patch) | |
| tree | 1dc8f5805b5f3f01933bc0035b3b6cad7b04b73a /Source/QtDialog | |
| parent | f9687e328f7ea64ea6384aae11af36fdd3a12643 (diff) | |
| download | CMake-ebd0c2d3771835a1317c1fd70eafd3ebf2135b01.zip CMake-ebd0c2d3771835a1317c1fd70eafd3ebf2135b01.tar.gz CMake-ebd0c2d3771835a1317c1fd70eafd3ebf2135b01.tar.bz2 | |
Merge in changes for RC 3
Diffstat (limited to 'Source/QtDialog')
| -rw-r--r-- | Source/QtDialog/CMake.desktop | 1 | ||||
| -rw-r--r-- | Source/QtDialog/CMakeSetupDialog.cxx | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop index 9568501..d1d4fb2 100644 --- a/Source/QtDialog/CMake.desktop +++ b/Source/QtDialog/CMake.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 Name=CMake Comment=Cross-platform buildsystem Exec=cmake-gui %f diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index ea65f2d..a3de4db 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -342,7 +342,7 @@ void CMakeSetupDialog::finishConfigure(int err) void CMakeSetupDialog::finishGenerate(int err) { - this->enterState(ReadyGenerate); + this->enterState(ReadyConfigure); if(err != 0) { QMessageBox::critical(this, tr("Error"), |