aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qtsupport/baseqtversion.h
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2018-05-07 17:31:39 +0200
committerOrgad Shaneh <orgads@gmail.com>2018-05-13 19:47:14 +0000
commitebf2d6f4e25282d0aeedfaccfddbb333c59f606b (patch)
treec1f3d664c373b71c7fa0b14e5cc588e214498ea9 /src/plugins/qtsupport/baseqtversion.h
parent79aa48e9a4de7054eb3d1e89a5d18e4f8726a94d (diff)
QtSupport: Consistently use nullptr
Fixed by clang-tidy modernize-use-nullptr. Change-Id: I534c782f9ef047a307ef440335fd7fc0a7979e08 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.h')
-rw-r--r--src/plugins/qtsupport/baseqtversion.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h
index 672d3c98af5..ca7deba6127 100644
--- a/src/plugins/qtsupport/baseqtversion.h
+++ b/src/plugins/qtsupport/baseqtversion.h
@@ -265,9 +265,12 @@ private:
QString findHostBinary(HostBinaries binary) const;
void updateMkspec() const;
QHash<ProKey, ProString> versionInfo() const;
- static bool queryQMakeVariables(const Utils::FileName &binary, const Utils::Environment &env,
- QHash<ProKey, ProString> *versionInfo, QString *error = 0);
- static QString qmakeProperty(const QHash<ProKey, ProString> &versionInfo, const QByteArray &name,
+ static bool queryQMakeVariables(const Utils::FileName &binary,
+ const Utils::Environment &env,
+ QHash<ProKey, ProString> *versionInfo,
+ QString *error = nullptr);
+ static QString qmakeProperty(const QHash<ProKey, ProString> &versionInfo,
+ const QByteArray &name,
PropertyVariant variant = PropertyVariantGet);
static Utils::FileName mkspecDirectoryFromVersionInfo(const QHash<ProKey,ProString> &versionInfo);
static Utils::FileName mkspecFromVersionInfo(const QHash<ProKey,ProString> &versionInfo);