diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-05 18:53:51 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-05 18:53:51 +0100 |
| commit | 26de4672a5976eeabbdefe444e33efb00c38d741 (patch) | |
| tree | fb741ce21175cd388115c508415cc04dcce1d8b4 /src/plugins/imageformats/dds/qddshandler.cpp | |
| parent | c9ab51464b1c71f5c2f8325be468fd44f60f6f27 (diff) | |
| parent | 5a1a12b0e135eb49f7b232c729859583b76bd507 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I588e16b5c0d1bde354d98d7747450932948f2c4d
Diffstat (limited to 'src/plugins/imageformats/dds/qddshandler.cpp')
| -rw-r--r-- | src/plugins/imageformats/dds/qddshandler.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/plugins/imageformats/dds/qddshandler.cpp b/src/plugins/imageformats/dds/qddshandler.cpp index 845f9b3..a0ac19b 100644 --- a/src/plugins/imageformats/dds/qddshandler.cpp +++ b/src/plugins/imageformats/dds/qddshandler.cpp @@ -1382,13 +1382,6 @@ QDDSHandler::QDDSHandler() : { } -#if QT_DEPRECATED_SINCE(5, 13) -QByteArray QDDSHandler::name() const -{ - return QByteArrayLiteral("dds"); -} -#endif - bool QDDSHandler::canRead() const { if (m_scanState == ScanNotScanned && !canRead(device())) |