diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2007-11-08 21:47:00 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2007-11-08 21:47:00 (GMT) |
| commit | 3cd1d6e9e1d34d59100c9992602ba45958f1824e (patch) | |
| tree | a01a4742ae5da8ae15408c6d4b6a9861ca7c0c70 /Source/QtDialog/QCMake.cxx | |
| parent | af46642debd4febc094ae06972daeb08d1e3c57d (diff) | |
| download | CMake-3cd1d6e9e1d34d59100c9992602ba45958f1824e.zip CMake-3cd1d6e9e1d34d59100c9992602ba45958f1824e.tar.gz CMake-3cd1d6e9e1d34d59100c9992602ba45958f1824e.tar.bz2 | |
BUG: Don't enable generate if configure completed with errors.
ENH: Allow build w/ Qt configured with no STL support.
Diffstat (limited to 'Source/QtDialog/QCMake.cxx')
| -rw-r--r-- | Source/QtDialog/QCMake.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx index bfa5af9..9d25170 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -54,7 +54,7 @@ QCMake::QCMake(QObject* p) std::vector<std::string>::iterator iter; for(iter = generators.begin(); iter != generators.end(); ++iter) { - this->AvailableGenerators.append(QString::fromStdString(*iter)); + this->AvailableGenerators.append(iter->c_str()); } } @@ -107,7 +107,7 @@ void QCMake::setBinaryDirectory(const QString& dir) const char* extraGen = cachem->GetCacheValue("CMAKE_EXTRA_GENERATOR"); std::string curGen = cmExternalMakefileProjectGenerator:: CreateFullGeneratorName(itm.GetValue(), extraGen); - this->setGenerator(QString::fromStdString(curGen)); + this->setGenerator(curGen.c_str()); } } } |