summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
Diffstat (limited to 'qmake')
-rw-r--r--qmake/CMakeLists.txt6
-rw-r--r--qmake/generators/makefile.cpp1
-rw-r--r--qmake/generators/projectgenerator.cpp2
-rw-r--r--qmake/generators/unix/unixmake2.cpp1
-rw-r--r--qmake/main.cpp2
-rw-r--r--qmake/option.cpp1
-rw-r--r--qmake/property.cpp1
7 files changed, 12 insertions, 2 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
index 30e00991b1..8b74b85c49 100644
--- a/qmake/CMakeLists.txt
+++ b/qmake/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
# Generated from qmake.pro.
#####################################################################
@@ -12,6 +15,9 @@ qt_add_library(QtLibraryInfo OBJECT
propertyprinter.cpp propertyprinter.h
qmakelibraryinfo.cpp qmakelibraryinfo.h
)
+
+qt_internal_add_sync_header_dependencies(QtLibraryInfo Core)
+
set_target_properties(QtLibraryInfo PROPERTIES
COMPILE_OPTIONS $<TARGET_PROPERTY:Qt::Core,INTERFACE_COMPILE_OPTIONS>
COMPILE_DEFINITIONS $<TARGET_PROPERTY:Qt::Core,INTERFACE_COMPILE_DEFINITIONS>
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>
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index 730e16fdaf..8e9e8cd37f 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.cpp
@@ -321,7 +321,7 @@ ProjectGenerator::writeMakefile(QTextStream &t)
"# Please consult the documentation of the deprecated API in order to know\n"
"# how to port your code away from it.\n"
"# You can also select to disable deprecated APIs only up to a certain version of Qt.\n"
- "#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0\n\n";
+ "#DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0x060000 # disables all APIs deprecated in Qt 6.0.0 and earlier\n\n";
t << "# Input" << "\n";
t << getWritableVar("HEADERS")
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 98c7e217cf..1b2989b978 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -10,6 +10,7 @@
#include <qfile.h>
#include <qdir.h>
#include <qdebug.h>
+#include <qlibraryinfo.h>
#include <time.h>
#include <tuple>
diff --git a/qmake/main.cpp b/qmake/main.cpp
index e546b1705c..9b96ab7338 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -423,7 +423,7 @@ bool qmake_setpwd(const QString &p)
int runQMake(int argc, char **argv)
{
- qSetGlobalQHashSeed(0);
+ QHashSeed::setDeterministicGlobalSeed();
// stderr is unbuffered by default, but stdout buffering depends on whether
// there is a terminal attached. Buffering can make output from stderr and stdout
diff --git a/qmake/option.cpp b/qmake/option.cpp
index f0e6c50341..55f21120c0 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -12,6 +12,7 @@
#include <stdarg.h>
#include <qmakelibraryinfo.h>
+#include <qlibraryinfo.h>
#include <private/qlibraryinfo_p.h>
QT_BEGIN_NAMESPACE
diff --git a/qmake/property.cpp b/qmake/property.cpp
index 358d7f3a3c..6ac1321355 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -5,6 +5,7 @@
#include <qdir.h>
#include <qsettings.h>
+#include <qlibraryinfo.h>
#include <qmakelibraryinfo.h>
#include <qstringlist.h>
#include <stdio.h>