[Cmake-commits] [cmake-commits] hoffman committed CMakeSetup.cxx 1.24.2.1 1.24.2.2 QCMake.cxx 1.27.2.1 1.27.2.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv18987/Source/QtDialog

Modified Files:
      Tag: CMake-2-8
	CMakeSetup.cxx QCMake.cxx 
Log Message:
RC 4 merge


Index: CMakeSetup.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetup.cxx,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C 2 -d -r1.24.2.1 -r1.24.2.2
*** CMakeSetup.cxx	1 Oct 2009 21:21:15 -0000	1.24.2.1
--- CMakeSetup.cxx	28 Oct 2009 16:15:41 -0000	1.24.2.2
***************
*** 17,25 ****
  #include <QLocale>
  #include "QMacInstallDialog.h"
- 
- #ifdef Q_OS_WIN
- #include "windows.h"  // for SetErrorMode
- #endif
- 
  #include "CMakeSetupDialog.h"
  #include "cmDocumentation.h"
--- 17,20 ----
***************
*** 104,111 ****
  
    QApplication app(argc, argv);
- #ifdef Q_OS_WIN
-   // QApplication changes error mode, let's put it back
-   SetErrorMode(0);
- #endif
    
    // clean out standard Qt paths for plugins, which we don't use anyway
--- 99,102 ----

Index: QCMake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMake.cxx,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -C 2 -d -r1.27.2.1 -r1.27.2.2
*** QCMake.cxx	1 Oct 2009 21:21:15 -0000	1.27.2.1
--- QCMake.cxx	28 Oct 2009 16:15:41 -0000	1.27.2.2
***************
*** 21,24 ****
--- 21,28 ----
  #include "cmExternalMakefileProjectGenerator.h"
  
+ #ifdef Q_OS_WIN
+ #include "qt_windows.h"  // For SetErrorMode
+ #endif
+ 
  QCMake::QCMake(QObject* p)
    : QObject(p)
***************
*** 149,152 ****
--- 153,160 ----
  void QCMake::configure()
  {
+ #ifdef Q_OS_WIN
+   UINT lastErrorMode = SetErrorMode(0);
+ #endif
+ 
    this->CMakeInstance->SetHomeDirectory(this->SourceDirectory.toAscii().data());
    this->CMakeInstance->SetStartDirectory(this->SourceDirectory.toAscii().data());
***************
*** 163,166 ****
--- 171,178 ----
    int err = this->CMakeInstance->Configure();
  
+ #ifdef Q_OS_WIN
+   SetErrorMode(lastErrorMode);
+ #endif
+ 
    emit this->propertiesChanged(this->properties());
    emit this->configureDone(err);
***************
*** 169,174 ****
--- 181,195 ----
  void QCMake::generate()
  {
+ #ifdef Q_OS_WIN
+   UINT lastErrorMode = SetErrorMode(0);
+ #endif
+ 
    cmSystemTools::ResetErrorOccuredFlag();
    int err = this->CMakeInstance->Generate();
+ 
+ #ifdef Q_OS_WIN
+   SetErrorMode(lastErrorMode);
+ #endif
+ 
    emit this->generateDone(err);
  }