diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-05-03 17:07:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-05-06 12:51:12 +0200 |
| commit | a783c3d574a1400c4dfdd32975fc511f095df8b2 (patch) | |
| tree | 7834a0eb04c052cc5ace7189404e56bf4c7970e2 /qmake/option.cpp | |
| parent | 9b92c5314e8362f5473611ea0d06f403836df5dd (diff) | |
qmake: Use qVersion for version reporting instead of QT_VERSION_STR
Apart from being consistent with qtpaths (which uses qVersion()),
this also ensures that Qt Creator loads correct debug helpers for types
like QString when debugging qmake.
As a drive by, remove all QT_VERSION_MAJOR, QT_VERSION_MINOR,
QT_VERSION_PATCH defines which are not used anywhere.
Change-Id: Ibc8f2a6af833e1ec6e6cd6e1937ac3c1ab328555
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index f30121e416..c2816ef498 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -224,7 +224,7 @@ Option::parseCommandLine(QStringList &args, QMakeCmdLineParserState &state) fprintf(stdout, "QMake version %s\n" "Using Qt version %s in %s\n", - QMAKE_VERSION_STR, QT_VERSION_STR, + QMAKE_VERSION_STR, qVersion(), QMakeLibraryInfo::path(QLibraryInfo::LibrariesPath) .toLatin1() .constData()); |