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 /tests/auto/corelib/global | |
| 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 'tests/auto/corelib/global')
| -rw-r--r-- | tests/auto/corelib/global/qglobal/qglobal.c | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/global/qglobal/tst_qglobal.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/corelib/global/qglobal/qglobal.c b/tests/auto/corelib/global/qglobal/qglobal.c index 3b898de39f..64569f4de7 100644 --- a/tests/auto/corelib/global/qglobal/qglobal.c +++ b/tests/auto/corelib/global/qglobal/qglobal.c @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include <QtCore/qglobal.h> +#include <QtCore/qlibraryinfo.h> #ifdef Q_COMPILER_THREAD_LOCAL # include <threads.h> diff --git a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp index 752fb948a5..3923b6d6ac 100644 --- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp +++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp @@ -8,6 +8,7 @@ #include <QSysInfo> #include <QLatin1String> #include <QString> +#include <QLibraryInfo> #include <cmath> |