diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-30 10:37:00 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-09-01 13:26:30 +0200 |
| commit | 50b05e3e2ad969abf4b939d5db2253380e47d775 (patch) | |
| tree | 8234f369db98fb720b19f6e14714dd8653b3801d /qmake/generators/makefile.cpp | |
| parent | b077c419eaafe82ada9ed723165b5c4bfcc80b12 (diff) | |
Move qVersion() from qglobal.h to qlibraryinfo.h
Since qVersion() might be called also from C code, disable the parts of
qlibraryinfo.h that are relevant only for C++ code if __cplusplus is not
defined.
[ChangeLog][Potentially Source-Incompatible Changes] qVersion() is
moved from qglobal.h to qlibraryinfo.h, '#include <QtCore/QLibraryInfo>'
needs to be added where it's used.
Task-number: QTBUG-99313
Change-Id: I3363ef3fa4073114e5151cb3a2a1e8282ad42a4d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 4c21ef8202..06ca1807a7 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -16,6 +16,7 @@ #include <qdebug.h> #include <qbuffer.h> #include <qdatetime.h> +#include <qlibraryinfo.h> #if defined(Q_OS_UNIX) #include <unistd.h> |