[Cmake-commits] [cmake-commits] hoffman committed CMakeSetup.cxx 1.17 1.17.2.1 CMakeSetupDialog.cxx 1.40 1.40.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeSetup.cxx CMakeSetupDialog.cxx 
Log Message:
ENH: move head to branch


Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -C 2 -d -r1.40 -r1.40.2.1
*** CMakeSetupDialog.cxx	12 Mar 2008 02:52:53 -0000	1.40
--- CMakeSetupDialog.cxx	18 Mar 2008 14:23:55 -0000	1.40.2.1
***************
*** 97,101 ****
    QObject::connect(this->GenerateAction, SIGNAL(triggered(bool)), 
                     this, SLOT(doGenerate()));
!   this->SuppressDevWarningsAction = ToolsMenu->addAction(tr("&Suppress dev Warnings"));
    QObject::connect(this->SuppressDevWarningsAction, SIGNAL(triggered(bool)), 
                     this, SLOT(doSuppressDev()));
--- 97,101 ----
    QObject::connect(this->GenerateAction, SIGNAL(triggered(bool)), 
                     this, SLOT(doGenerate()));
!   this->SuppressDevWarningsAction = ToolsMenu->addAction(tr("&Suppress dev Warnings (-Wno-dev)"));
    QObject::connect(this->SuppressDevWarningsAction, SIGNAL(triggered(bool)), 
                     this, SLOT(doSuppressDev()));
***************
*** 484,487 ****
--- 484,488 ----
      m.replace(QString("<"), QString("&lt;"));
      m.replace(QString(">"), QString("&gt;"));
+     m.replace(QString(" "), QString("&nbsp;"));
      this->Output->append(QString("<b><font color=red>%1</font></b>").arg(m));
      }

Index: CMakeSetup.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetup.cxx,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C 2 -d -r1.17 -r1.17.2.1
*** CMakeSetup.cxx	19 Feb 2008 19:06:10 -0000	1.17
--- CMakeSetup.cxx	18 Mar 2008 14:23:55 -0000	1.17.2.1
***************
*** 69,72 ****
--- 69,79 ----
    QApplication app(argc, argv);
    
+   // clean out standard Qt paths for plugins, which we don't use anyway
+   // when creating Mac bundles, it potentially causes problems
+   foreach(QString p, QApplication::libraryPaths())
+     {
+     QApplication::removeLibraryPath(p);
+     }
+   
    // if arg for install 
    for(int i =0; i < argc; i++)