diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2022-09-01 17:15:27 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2022-09-01 20:26:01 +0200 |
| commit | c1fe2b6da61f4bd55c7551b4f0c1b379ed814ffe (patch) | |
| tree | 913db588097902f30beac1faf2bfeedd96d47644 /vcl/qt5 | |
| parent | 9b140c16196585eeabbd15bb6562eb371e399373 (diff) | |
qt: Add include needed with qtbase dev branch
`qVersion()` has been moved to a different header in
qtbase commit [1]:
commit 50b05e3e2ad969abf4b939d5db2253380e47d775 (gerrit/dev)
Author: Sona Kurazyan <sona.kurazyan@qt.io>
Date: Tue Aug 30 10:37:00 2022 +0200
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>
[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=50b05e3e2ad969abf4b939d5db2253380e47d775
Change-Id: Iafeb0ed6a77420f9a303d8ec4d3c5ba29c6f4b19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139221
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'vcl/qt5')
| -rw-r--r-- | vcl/qt5/QtInstance.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx index 5522ea15c31a..9c4d3def970e 100644 --- a/vcl/qt5/QtInstance.cxx +++ b/vcl/qt5/QtInstance.cxx @@ -39,6 +39,7 @@ #include <headless/svpvd.hxx> #include <QtCore/QAbstractEventDispatcher> +#include <QtCore/QLibraryInfo> #include <QtCore/QThread> #include <QtGui/QScreen> #include <QtWidgets/QApplication> |