AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash if QPixmap::defaultDepth() is called when no QGuiApplication

Browse Source 
This static method can be called before QGuiApplication is created. At
that point there is yet no primary screen, so the implementation
needs to guard against dereferencing a nullptr.

Task-number: QTBUG-67309
Change-Id: I6b7b9e97b1c3c79bf2f9c6d6247c3b10f39f7a55
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Eirik Aavitsland 2018-04-05 13:02:35 +02:00
parent e8733ffc51
commit 7f782e1fc4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/image/qpixmap.cpp
View File

@ -1467,12 +1467,18 @@ QBitmap QPixmap::mask() const
On all platforms the depth of the primary screen will be returned.
\note QGuiApplication must be created before calling this function.
\sa depth(), QColormap::depth(), {QPixmap#Pixmap Information}{Pixmap Information}
*/
int QPixmap::defaultDepth()
{
return QGuiApplication::primaryScreen()->depth();
QScreen *primary = QGuiApplication::primaryScreen();
if (Q_LIKELY(primary))
return primary->depth();
qWarning("QPixmap: QGuiApplication must be created before calling defaultDepth().");
return 0;
}
/*!

2
tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
View File

@ -1099,6 +1099,8 @@ void tst_QGuiApplication::staticFunctions()
QGuiApplication::setQuitOnLastWindowClosed(true);
QGuiApplication::quitOnLastWindowClosed();
QGuiApplication::applicationState();
QPixmap::defaultDepth();
}
void tst_QGuiApplication::settableStyleHints_data()