summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <[email protected]>2022-06-10 21:53:21 +0200
committerAlexey Edelev <[email protected]>2022-09-06 20:15:00 +0200
commit05cc5b3541700572f39cf98f8aeaba50c1342dae (patch)
tree7b8e543b12e688ce71e11c98406eb0e1075b72db
parenta6050125a700d677b786f9db0a475af9975e9fc4 (diff)
Introduce the qt_deprecates pragma
The qt_deprecates pragma indicates that the file passed as argument is deprecated and supposed to be replaced by the file where the pragma is defined. Syncqt procedure generates the file passed as argument automatically with the deprecation warning. After the deprecation period the pragma should be removed and the deprecated file will not be included to the Qt installation too. The pragma is only handled by the cpp version of syncqt cpp and supposed to replace the 'deprecatedheaders' record in sync.profiles. Change-Id: Ibe69423a5de67f58907a3edbc5961f5ab63944de Reviewed-by: Alexandru Croitor <[email protected]>
-rw-r--r--src/dbus/qtdbusglobal.h4
-rw-r--r--src/sql/kernel/qtsqlglobal.h1
-rw-r--r--src/testlib/qttestglobal.h4
3 files changed, 9 insertions, 0 deletions
diff --git a/src/dbus/qtdbusglobal.h b/src/dbus/qtdbusglobal.h
index 9724c066f6a..3c2268c8c32 100644
--- a/src/dbus/qtdbusglobal.h
+++ b/src/dbus/qtdbusglobal.h
@@ -4,6 +4,10 @@
#ifndef QTDBUSGLOBAL_H
#define QTDBUSGLOBAL_H
+#if 0
+#pragma qt_deprecates(qdbusmacros.h)
+#endif
+
#include <QtCore/qglobal.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qvariant.h>
diff --git a/src/sql/kernel/qtsqlglobal.h b/src/sql/kernel/qtsqlglobal.h
index 977d97abbf6..b01010d653d 100644
--- a/src/sql/kernel/qtsqlglobal.h
+++ b/src/sql/kernel/qtsqlglobal.h
@@ -6,6 +6,7 @@
#if 0
#pragma qt_class(QSql)
+#pragma qt_deprecates(qsql.h)
#endif
#include <QtCore/qglobal.h>
diff --git a/src/testlib/qttestglobal.h b/src/testlib/qttestglobal.h
index 8ede78c2a2f..ee2f350b80c 100644
--- a/src/testlib/qttestglobal.h
+++ b/src/testlib/qttestglobal.h
@@ -4,6 +4,10 @@
#ifndef QTTESTGLOBAL_H
#define QTTESTGLOBAL_H
+#if 0
+#pragma qt_deprecates(qtest_global.h)
+#endif
+
#include <QtCore/qglobal.h>
#include <QtTest/qttestlib-config.h>
#include <QtTest/qttestexports.h>