summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@theqtcompany.com>2015-10-29 14:33:10 +0100
committerTobias Hunger <tobias.hunger@theqtcompany.com>2015-10-29 16:21:18 +0000
commitca6144f0d661f96e102c8e3543e16593310cb794 (patch)
treee17acaf3c90eeeab2dc7092b4ad06e8f47a322bb /src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
parentb811089f6c0266a217e3ccabed30e48ca2ae612d (diff)
downloadqt-creator-ca6144f0d661f96e102c8e3543e16593310cb794.tar.gz
CMake: Fix cmake preloadCache file support
* Make it work at all again for cmake configurations without a preloadCache file * Fix the KitInformation to provide the getters/setters like all the other KitInformation do * Use those setters consistently * Remove useless conversion from QString to QByteArray and back Change-Id: I8fc43b3531da2c04034c89b29915a29c331fe064 Reviewed-by: Cristian Adam <cristian.adam@gmail.com> Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 5510968bf9..f624b46383 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -160,7 +160,8 @@ void CMakeManager::createXmlFile(Utils::QtcProcess *proc, const QString &executa
Utils::QtcProcess::addArg(&args, srcdir);
Utils::QtcProcess::addArgs(&args, arguments);
Utils::QtcProcess::addArg(&args, generator);
- Utils::QtcProcess::addArg(&args, preloadCache);
+ if (!preloadCache.isEmpty())
+ Utils::QtcProcess::addArg(&args, preloadCache);
proc->setCommand(executable, args);
proc->start();
}