summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-12-06 07:50:20 +0100
committerMarc Mutz <marc.mutz@qt.io>2022-12-09 07:21:22 +0100
commit885aba7ffdfaf410f16364f315411cf8d77da38a (patch)
treefe7cefc7e4db631d293374dcf90f5d97aa2464dc /qmake
parentabaa3e61120529b656922c2272b99a674d9e1a38 (diff)
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>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/makefile.cpp2
-rw-r--r--qmake/generators/unix/unixmake2.cpp2
-rw-r--r--qmake/option.cpp2
-rw-r--r--qmake/property.cpp2
4 files changed, 4 insertions, 4 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>