Deprecate qtmultimediawidgetdefs.h

Rather use the more common qtmultimediawidgetsglobal.h
pattern. This also fixes a syncqt warning that the header
doesn't contain QT_BEGIN_NAMESPACE...

Change-Id: If361c93561adce06fbe61b00bc9acee356cf477d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>

5 files changed, 11 insertions, 21 deletions

diff --git a/src/multimediawidgets/CMakeLists.txt b/src/multimediawidgets/CMakeLists.txt
index 460cf00c8..f605c3a11 100644
--- a/src/multimediawidgets/CMakeLists.txt
+++ b/src/multimediawidgets/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_module(MultimediaWidgets
     SOURCES
-        qtmultimediawidgetdefs.h
+        qtmultimediawidgetsglobal.h
         qvideowidget.cpp qvideowidget.h qvideowidget_p.h
     LIBRARIES
         Qt::MultimediaPrivate
diff --git a/src/multimediawidgets/qtmultimediawidgetdefs.h b/src/multimediawidgets/qtmultimediawidgetsglobal.h
index be766ecb7..b6f0df9a6 100644
--- a/src/multimediawidgets/qtmultimediawidgetdefs.h
+++ b/src/multimediawidgets/qtmultimediawidgetsglobal.h
@@ -1,9 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Toolkit.
+** This file is part of the QtMultimediaWidgets module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -37,22 +37,9 @@
 **
 ****************************************************************************/
 
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
+#ifndef QTMULTIMEDIAWIDGETSGLOBAL_H
+#define QTMULTIMEDIAWIDGETSGLOBAL_H
 
-#ifndef QTMULTIMEDIAWIDGETS_P_H
-#define QTMULTIMEDIAWIDGETS_P_H
-
-#include <QtCore/qglobal.h>
 #include <QtMultimediaWidgets/qtmultimediawidgetsexports.h>
 
-#endif // QMULTIMEDIAWIDGETS_P_H
-
+#endif // QTMULTIMEDIAWIDGETSGLOBAL_H
diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h
index c7369d9bd..b5d9144f5 100644
--- a/src/multimediawidgets/qvideowidget.h
+++ b/src/multimediawidgets/qvideowidget.h
@@ -42,7 +42,7 @@
 
 #include <QtWidgets/qwidget.h>
 
-#include <QtMultimediaWidgets/qtmultimediawidgetdefs.h>
+#include <QtMultimediaWidgets/qtmultimediawidgetsglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimediawidgets/qvideowidget_p.h b/src/multimediawidgets/qvideowidget_p.h
index 9a79f58ed..b3325fe78 100644
--- a/src/multimediawidgets/qvideowidget_p.h
+++ b/src/multimediawidgets/qvideowidget_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <qtmultimediawidgetdefs.h>
+#include <QtMultimediaWidgets/qtmultimediawidgetsglobal.h>
 #include <qvideoframe.h>
 #include "qvideowidget.h"
 
diff --git a/sync.profile b/sync.profile
index 5c3a5acb8..7b8ab974c 100644
--- a/sync.profile
+++ b/sync.profile
@@ -16,4 +16,7 @@
     "QtMultimedia" =>  {
         "qtmultimediadefs.h" => "QtMultimedia/qtmultimediaglobal.h"
     },
+    "QtMultimediaWidgets" =>  {
+        "qtmultimediawidgetdefs.h" => "QtMultimediaWidgets/qtmultimediawidgetsglobal.h"
+    }
 );