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 | |
| 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')
| -rw-r--r-- | qmake/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 | ||||
| -rw-r--r-- | qmake/option.cpp | 2 | ||||
| -rw-r--r-- | qmake/property.cpp | 6 |
5 files changed, 4 insertions, 12 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 6eae6ecd39..30e00991b1 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -34,10 +34,6 @@ target_compile_definitions(QtLibraryInfo PUBLIC QT_BUILD_QMAKE QT_USE_QSTRINGBUILDER QT_NO_FOREACH - QT_VERSION_STR="${PROJECT_VERSION}" # special case - QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} # special case - QT_VERSION_MINOR=${PROJECT_VERSION_MINOR} # special case - QT_VERSION_PATCH=${PROJECT_VERSION_PATCH} # special case QT_HOST_MKSPEC="${QT_QMAKE_HOST_MKSPEC}" QT_TARGET_MKSPEC="${QT_QMAKE_TARGET_MKSPEC}" QT_HOST_DATADIR="${hostdatadir}" diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index e16082e62c..f3fc800804 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2322,7 +2322,7 @@ MakefileGenerator::writeHeader(QTextStream &t) { t << "#############################################################################\n"; t << "# Makefile for building: " << escapeFilePath(var("TARGET")) << Qt::endl; - t << "# Generated by qmake (" QMAKE_VERSION_STR ") (Qt " QT_VERSION_STR ")\n"; + t << "# Generated by qmake (" QMAKE_VERSION_STR ") (Qt " << qVersion() << ")\n"; t << "# Project: " << fileFixify(project->projectFile()) << Qt::endl; t << "# Template: " << var("TEMPLATE") << Qt::endl; if(!project->isActiveConfig("build_pass")) diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 60c5e8a220..edebc0425d 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1500,7 +1500,7 @@ UnixMakefileGenerator::writeLibtoolFile() QTextStream t(&ft); t << "# " << lname << " - a libtool library file\n"; t << "# Generated by qmake/libtool (" QMAKE_VERSION_STR ") (Qt " - << QT_VERSION_STR << ")"; + << qVersion() << ")"; t << "\n"; t << "# The name that we can dlopen(3).\n" 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()); diff --git a/qmake/property.cpp b/qmake/property.cpp index 2a1c4170b9..49b07f61b8 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -100,9 +100,7 @@ void QMakeProperty::reload() #ifdef QMAKE_VERSION_STR m_values["QMAKE_VERSION"] = ProString(QMAKE_VERSION_STR); #endif -#ifdef QT_VERSION_STR - m_values["QT_VERSION"] = ProString(QT_VERSION_STR); -#endif + m_values["QT_VERSION"] = ProString(qVersion()); } QMakeProperty::~QMakeProperty() @@ -168,9 +166,7 @@ int QMakeProperty::queryProperty(const QStringList &optionProperties, #ifdef QMAKE_VERSION_STR specialProps.append("QMAKE_VERSION"); #endif -#ifdef QT_VERSION_STR specialProps.append("QT_VERSION"); -#endif for (const QString &prop : qAsConst(specialProps)) { ProString val = value(ProKey(prop)); ProString pval = value(ProKey(prop + "/raw")); |