From a783c3d574a1400c4dfdd32975fc511f095df8b2 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 3 May 2022 17:07:40 +0200 Subject: qmake: Use qVersion for version reporting instead of QT_VERSION_STR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Jörg Bornemann --- qmake/option.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake/option.cpp') 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()); -- cgit v1.2.3