diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-04 21:32:01 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-08 09:55:53 +0200 |
| commit | 3f5e21a0cc9f41f1747e5c431695e7798ee489db (patch) | |
| tree | ccd9f02554d16f68fb66a8f2dd59368dd1a43c30 /src/quick/items/qquickwindow.h | |
| parent | c8dd51333f14941d9a5c2d3798768df342aa48d4 (diff) | |
Remove OpenGL dependency from QSGTexture
The QSGTexture API is now clean, the OpenGL-specific functions are
removed.
Docs are to be updated in a separate patch.
QSGPlainTexture, and a number of texture related places have to follow
suit.
The OpenGL atlas texture implementation is now removed.
Task-number: QTBUG-84717
Task-number: QTBUG-84623
Change-Id: I1aab3b8b9145bb74ad39ef836ce540fc851292c5
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow.h')
| -rw-r--r-- | src/quick/items/qquickwindow.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index ed24d01c05..5266debec5 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -155,11 +155,6 @@ public: QSGTexture *createTextureFromImage(const QImage &image) const; QSGTexture *createTextureFromImage(const QImage &image, CreateTextureOptions options) const; -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED_X("Use createTextureFromNativeObject() instead") - QSGTexture *createTextureFromId(uint id, const QSize &size, CreateTextureOptions options = CreateTextureOption()) const; -#endif - QSGTexture *createTextureFromNativeObject(NativeObjectType type, quint64 nativeObjectHandle, int nativeLayout, |