diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-01-20 13:11:46 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-29 08:47:23 +0000 |
| commit | ed3301b9d4479f24b1588d802d4f017e394bd56b (patch) | |
| tree | e5633344e18b38fb968212f8a42903db1d52320c /src/imports | |
| parent | 5ba50181b3b2a13b2fbb96bb2fd171f54de52327 (diff) | |
Don't define QT_DISABLE_DEPRECATED_BEFORE to 0
Remove those defines, they cause the cmake build to break
as we get the define set from the global Qt configuration
code in qtbase.
Change-Id: I09b5848a0023c96bbf46a9208b14149bd3d4602a
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/imports/multimedia/CMakeLists.txt b/src/imports/multimedia/CMakeLists.txt index 823cd47ef..ec3ef3f19 100644 --- a/src/imports/multimedia/CMakeLists.txt +++ b/src/imports/multimedia/CMakeLists.txt @@ -24,8 +24,6 @@ qt_internal_add_qml_module(declarative_multimedia qdeclarativemultimediaglobal.cpp qdeclarativemultimediaglobal_p.h qdeclarativeplaylist.cpp qdeclarativeplaylist_p.h qdeclarativetorch.cpp qdeclarativetorch_p.h - DEFINES - QT_DISABLE_DEPRECATED_BEFORE=0 PUBLIC_LIBRARIES Qt::Core Qt::Gui diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index 4a5f359fe..076d13b09 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -40,6 +40,4 @@ SOURCES += \ QML_FILES += \ Video.qml -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 - load(qml_plugin) |