summaryrefslogtreecommitdiffstats
path: root/Source/QtDialog/QCMake.cxx
diff options
context:
space:
mode:
authorClinton Stimpson <clinton@elemtech.com>2008-04-07 23:19:50 (GMT)
committerClinton Stimpson <clinton@elemtech.com>2008-04-07 23:19:50 (GMT)
commit7d2bbfe84244031c25a9c71483f71fa95b1f29e8 (patch)
tree9dfd36735ae15fc70628ce1c28a976284db2ba54 /Source/QtDialog/QCMake.cxx
parent1829bed8b5dd4c1d3b622a14160d3a6706bcc16e (diff)
downloadCMake-7d2bbfe84244031c25a9c71483f71fa95b1f29e8.zip
CMake-7d2bbfe84244031c25a9c71483f71fa95b1f29e8.tar.gz
CMake-7d2bbfe84244031c25a9c71483f71fa95b1f29e8.tar.bz2
BUG: Fix #6733. Always convert "\" to "/" in source & binary directory fields on Windows.
Diffstat (limited to 'Source/QtDialog/QCMake.cxx')
-rw-r--r--Source/QtDialog/QCMake.cxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index c10d9a6..60ca2fe 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/Source/QtDialog/QCMake.cxx
@@ -86,8 +86,8 @@ void QCMake::setSourceDirectory(const QString& dir)
{
if(this->SourceDirectory != dir)
{
- this->SourceDirectory = dir;
- emit this->sourceDirChanged(dir);
+ this->SourceDirectory = QDir::fromNativeSeparators(dir);
+ emit this->sourceDirChanged(this->SourceDirectory);
}
}
@@ -95,12 +95,14 @@ void QCMake::setBinaryDirectory(const QString& dir)
{
if(this->BinaryDirectory != dir)
{
+ this->BinaryDirectory = QDir::fromNativeSeparators(dir);
+ emit this->binaryDirChanged(this->BinaryDirectory);
cmCacheManager *cachem = this->CMakeInstance->GetCacheManager();
- this->BinaryDirectory = dir;
this->setGenerator(QString());
- if(!this->CMakeInstance->GetCacheManager()->LoadCache(dir.toLocal8Bit().data()))
+ if(!this->CMakeInstance->GetCacheManager()->LoadCache(
+ this->BinaryDirectory.toLocal8Bit().data()))
{
- QDir testDir(dir);
+ QDir testDir(this->BinaryDirectory);
if(testDir.exists("CMakeCache.txt"))
{
cmSystemTools::Error("There is a CMakeCache.txt file for the current binary "