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

Make qpixmap autotest build without widgets

Browse Source 
Change-Id: Iabf1e6815a2af79d9da84c0e2bb9c2de52cb698f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Kent Hansen 2012-06-05 13:28:16 +02:00 committed by Qt by Nokia
parent c6d3942ea7
commit fe6fe39415
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/gui/image/qpixmap/qpixmap.pro
View File

@ -1,7 +1,8 @@
CONFIG += testcase
TARGET = tst_qpixmap
QT += core-private gui-private widgets widgets-private testlib
QT += core-private gui-private testlib
!contains(QT_CONFIG, no-widgets): QT += widgets widgets-private
SOURCES += tst_qpixmap.cpp
!wince* {

10
tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
View File

@ -46,9 +46,11 @@
#include <qimage.h>
#include <qimagereader.h>
#include <qmatrix.h>
#ifndef QT_NO_WIDGETS
#include <qdesktopwidget.h>
#include <qpaintengine.h>
#include <qsplashscreen.h>
#endif
#include <qpaintengine.h>
#include <qpa/qplatformpixmap.h>
#include <qpa/qplatformintegration.h>
@ -153,7 +155,9 @@ private slots:
void fromImageReaderAnimatedGif();
void preserveDepth();
#ifndef QT_NO_WIDGETS
void splash_crash();
#endif
void toImageDeepCopy();
@ -720,6 +724,7 @@ void tst_QPixmap::grabWindow()
{
// ### fixme: Check platforms
QSKIP("QTBUG-20863 grabWindow is broken on most qpa backends");
#ifndef QT_NO_WIDGETS
#ifdef Q_OS_WINCE
// We get out of memory, if the desktop itself is too big.
if (QApplication::desktop()->width() <= 480)
@ -747,6 +752,7 @@ void tst_QPixmap::grabWindow()
QPixmap grabWindowPixmap = QPixmap::grabWindow(child.winId());
QPixmap grabWidgetPixmap = QPixmap::grabWidget(&child);
lenientCompare(grabWindowPixmap, grabWidgetPixmap);
#endif
}
void tst_QPixmap::isNull()
@ -1203,6 +1209,7 @@ void tst_QPixmap::fromImage_crash()
delete img;
}
#ifndef QT_NO_WIDGETS
//This is testing QPlatformPixmap::createCompatiblePlatformPixmap - see QTBUG-5977
void tst_QPixmap::splash_crash()
{
@ -1213,6 +1220,7 @@ void tst_QPixmap::splash_crash()
QCoreApplication::processEvents();
splash.close();
}
#endif
void tst_QPixmap::fromData()
{