feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Fix cmake preloadCache file support

Browse Source 
* 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>
This commit is contained in:
Tobias Hunger
2015-10-29 14:33:10 +01:00
parent b811089f6c
commit ca6144f0d6
7 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.cpp
View File

@@ -78,8 +78,7 @@ void CMakePreloadCacheKitInformation::fix(Kit *k)
KitInformation::ItemList CMakePreloadCacheKitInformation::toUserOutput(const Kit *k) const
{
return ItemList()
<< qMakePair(tr("CMake Preload"), k->value(id()).toString());
return ItemList() << qMakePair(tr("CMake Preload"), k->value(id()).toString());
}
KitConfigWidget *CMakePreloadCacheKitInformation::createConfigWidget(Kit *k) const
@@ -87,4 +86,18 @@ KitConfigWidget *CMakePreloadCacheKitInformation::createConfigWidget(Kit *k) con
return new Internal::CMakePreloadCacheKitConfigWidget(k, this);
}
void CMakePreloadCacheKitInformation::setPreloadCacheFile(Kit *k, const QString &preload)
{
if (!k)
return;
k->setValue(CMakePreloadCacheKitInformation::id(), preload);
}
QString CMakePreloadCacheKitInformation::preloadCacheFile(const Kit *k)
{
if (!k)
return QString();
return k->value(CMakePreloadCacheKitInformation::id()).toString();
}
} // namespace CMakeProjectManager