diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2023-08-25 19:12:29 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-29 16:24:17 +0000 |
| commit | 6eee5c6378d64da216810a3ec70f596379258771 (patch) | |
| tree | e2b4fa3f996efb4a5fc33c2cd9db6f0e30b331c4 | |
| parent | 427c955347b515e3ca6e308cadbbb513e1c84f24 (diff) | |
Re-enable generating of the deprecated Designer header files
Some Designer header files were, moved to the UiPlugin module. Those
header files should remain in Designer module as deprecated, but the
mechanism that did this was broken during syncqt refactoring. Restore
these deprecated files.
Fixes: QTBUG-116483
Pick-to: 6.5
Change-Id: I72e3770f9114ee81a1dcfff2e3e356fb33d4460f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 59d5f8b694a5472852e85cdaf940390e2c9662e2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/designer/src/lib/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/uiplugin/customwidget.h | 6 | ||||
| -rw-r--r-- | src/uiplugin/qdesignerexportwidget.h | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/designer/src/lib/CMakeLists.txt b/src/designer/src/lib/CMakeLists.txt index edd7c7fd3..6e335cad1 100644 --- a/src/designer/src/lib/CMakeLists.txt +++ b/src/designer/src/lib/CMakeLists.txt @@ -467,3 +467,6 @@ qt_internal_extend_target(Designer CONDITION QT_FEATURE_opengl LIBRARIES Qt::OpenGL ) + +# UiPlugin module generates deprecated header files for Designer. +qt_internal_add_sync_header_dependencies(Designer UiPlugin) diff --git a/src/uiplugin/customwidget.h b/src/uiplugin/customwidget.h index 929040573..f5920488e 100644 --- a/src/uiplugin/customwidget.h +++ b/src/uiplugin/customwidget.h @@ -8,6 +8,12 @@ #include <QtCore/qstring.h> #include <QtGui/qicon.h> +#if 0 +#pragma qt_deprecates(QtDesigner/customwidget.h) +#pragma qt_deprecates(QtDesigner/QDesignerCustomWidgetInterface) +#pragma qt_deprecates(QtDesigner/QDesignerCustomWidgetCollectionInterface) +#endif + QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/uiplugin/qdesignerexportwidget.h b/src/uiplugin/qdesignerexportwidget.h index d90e9b217..ac4f2dcc2 100644 --- a/src/uiplugin/qdesignerexportwidget.h +++ b/src/uiplugin/qdesignerexportwidget.h @@ -11,6 +11,8 @@ QT_BEGIN_NAMESPACE #if 0 // pragma for syncqt, don't remove. #pragma qt_class(QDesignerExportWidget) +#pragma qt_deprecates(QtDesigner/qdesignerexportwidget.h) +#pragma qt_deprecates(QtDesigner/QDesignerExportWidget) #endif #if defined(QDESIGNER_EXPORT_WIDGETS) |