From 885aba7ffdfaf410f16364f315411cf8d77da38a Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Tue, 6 Dec 2022 07:50:20 +0100
Subject: [PATCH] Use qtversion.h instead of qlibraryinfo.h

... where 50b05e3e2ad969abf4b939d5db2253380e47d775 originally added
them.

While qtversion.h is included in qglobal.h, using qtversion.h directly
is a tiny step towards removing qglobal.h includes from our code-base,
so don't let this opportunity go to waste.

Change-Id: I28eaca1f4e250fc9e12e2ce6a6f94670a1d08dbe
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
---
 qmake/generators/makefile.cpp                     | 2 +-
 qmake/generators/unix/unixmake2.cpp               | 2 +-
 qmake/option.cpp                                  | 2 +-
 qmake/property.cpp                                | 2 +-
 src/gui/accessible/linux/atspiadaptor.cpp         | 2 +-
 tests/auto/corelib/global/qglobal/qglobal.c       | 2 +-
 tests/auto/corelib/global/qglobal/tst_qglobal.cpp | 2 +-
 tests/manual/highdpi/dprgadget/main.cpp           | 2 +-
 tests/manual/shortcuts/main.cpp                   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 60d96f13db..257601eaf7 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -16,7 +16,7 @@
 #include <qdebug.h>
 #include <qbuffer.h>
 #include <qdatetime.h>
-#include <qlibraryinfo.h>
+#include <qtversion.h>
 
 #if defined(Q_OS_UNIX)
 #include <unistd.h>
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 6bd1a8340e..20ba642e9d 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -10,7 +10,7 @@
 #include <qfile.h>
 #include <qdir.h>
 #include <qdebug.h>
-#include <qlibraryinfo.h>
+#include <qtversion.h>
 #include <time.h>
 
 #include <tuple>
diff --git a/qmake/option.cpp b/qmake/option.cpp
index d2092f2257..885022b673 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -12,7 +12,7 @@
 #include <stdarg.h>
 
 #include <qmakelibraryinfo.h>
-#include <qlibraryinfo.h>
+#include <qtversion.h>
 #include <private/qlibraryinfo_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/qmake/property.cpp b/qmake/property.cpp
index 664047ec01..af4ed0e9ee 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -5,7 +5,7 @@
 
 #include <qdir.h>
 #include <qsettings.h>
-#include <qlibraryinfo.h>
+#include <qtversion.h>
 #include <qmakelibraryinfo.h>
 #include <qstringlist.h>
 #include <stdio.h>
diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp
index c931dc4d1a..e6ada2c240 100644
--- a/src/gui/accessible/linux/atspiadaptor.cpp
+++ b/src/gui/accessible/linux/atspiadaptor.cpp
@@ -11,7 +11,7 @@
 #include <qclipboard.h>
 
 #include <QtCore/qloggingcategory.h>
-#include <QtCore/qlibraryinfo.h>
+#include <QtCore/qtversion.h>
 
 #if QT_CONFIG(accessibility)
 #include "socket_interface.h"
diff --git a/tests/auto/corelib/global/qglobal/qglobal.c b/tests/auto/corelib/global/qglobal/qglobal.c
index 64569f4de7..abe6ec4fde 100644
--- a/tests/auto/corelib/global/qglobal/qglobal.c
+++ b/tests/auto/corelib/global/qglobal/qglobal.c
@@ -2,7 +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>
+#include <QtCore/qtversion.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 4b0b97de0b..3f4e903a9a 100644
--- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
+++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
@@ -8,7 +8,7 @@
 #include <QSysInfo>
 #include <QLatin1String>
 #include <QString>
-#include <QLibraryInfo>
+#include <QtVersion>
 
 #include <cmath>
 
diff --git a/tests/manual/highdpi/dprgadget/main.cpp b/tests/manual/highdpi/dprgadget/main.cpp
index c8d7add901..b0a4191890 100644
--- a/tests/manual/highdpi/dprgadget/main.cpp
+++ b/tests/manual/highdpi/dprgadget/main.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2020 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include <QtCore/qlibraryinfo.h>
+#include <QtCore/qtversion.h>
 #include <QtGui/qpa/qplatformscreen.h>
 #include <QtGui/qpa/qplatformwindow.h>
 #include <QtGui/private/qhighdpiscaling_p.h>
diff --git a/tests/manual/shortcuts/main.cpp b/tests/manual/shortcuts/main.cpp
index bcdd47cab7..44be64d974 100644
--- a/tests/manual/shortcuts/main.cpp
+++ b/tests/manual/shortcuts/main.cpp
@@ -8,7 +8,7 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QDebug>
-#include <QLibraryInfo>
+#include <QtVersion>
 
 class ShortcutTester : public QWidget
 {