diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-04 09:45:26 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-12 23:35:56 +0200 |
| commit | 557623cc4f22295e5e89462dfdff20d78b3b9cdc (patch) | |
| tree | a10e2bf2b43ddae1cf90cf8005eb0e2957f716f7 /qmake | |
| parent | d24174918f1f224cd32f41b1a640a9db27965e64 (diff) | |
Rename QLibraryInfo::location() to path()
As per ### Qt6 comment. Also rename the LibraryLocation enum
to LibraryPath.
Change-Id: I556025a19c5bcdf2ff52598eaba32269522d4128
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/option.cpp | 2 | ||||
| -rw-r--r-- | qmake/property.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 58688ab2d6..df8a5742a1 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -218,7 +218,7 @@ Option::parseCommandLine(QStringList &args, QMakeCmdLineParserState &state) "QMake version %s\n" "Using Qt version %s in %s\n", QMAKE_VERSION_STR, QT_VERSION_STR, - QLibraryInfo::location(QLibraryInfo::LibrariesPath).toLatin1().constData()); + QLibraryInfo::path(QLibraryInfo::LibrariesPath).toLatin1().constData()); #ifdef QMAKE_OPENSOURCE_VERSION fprintf(stdout, "QMake is Open Source software from The Qt Company Ltd and/or its subsidiary(-ies).\n"); #endif diff --git a/qmake/property.cpp b/qmake/property.cpp index 31d6cdc9d6..971607ef61 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE static const struct { const char *name; - QLibraryInfo::LibraryLocation loc; + QLibraryInfo::LibraryPath loc; bool raw; bool singular; } propList[] = { @@ -84,7 +84,7 @@ void QMakeProperty::reload() QString val = QLibraryInfo::rawLocation(propList[i].loc, QLibraryInfo::FinalPaths); if (!propList[i].raw) { m_values[ProKey(name + "/dev")] = QLibraryInfo::rawLocation(propList[i].loc, QLibraryInfo::DevicePaths); - m_values[ProKey(name)] = QLibraryInfo::location(propList[i].loc); + m_values[ProKey(name)] = QLibraryInfo::path(propList[i].loc); name += "/raw"; } m_values[ProKey(name)] = val; |