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

Make qicon autotest build without widgets

Browse Source 
Change-Id: Ic6176404076bac956d00d57c99e0bbf0ac78beca
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Kent Hansen 2012-06-05 13:35:14 +02:00 committed by Qt by Nokia
parent 23994a364e
commit 027cd4c1b9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,8 @@ CONFIG += testcase
CONFIG += parallel_test CONFIG += parallel_test
TARGET = tst_qicon TARGET = tst_qicon
QT += widgets testlib QT += testlib
!contains(QT_CONFIG, no-widgets): QT += widgets
SOURCES += tst_qicon.cpp SOURCES += tst_qicon.cpp
RESOURCES = tst_qicon.qrc RESOURCES = tst_qicon.qrc

4
tests/auto/gui/image/qicon/tst_qicon.cpp
View File

@ -70,7 +70,9 @@ private slots:
void streamAvailableSizes(); void streamAvailableSizes();
void fromTheme(); void fromTheme();
#ifndef QT_NO_WIDGETS
void task184901_badCache(); void task184901_badCache();
#endif
void task223279_inconsistentAddFile(); void task223279_inconsistentAddFile();
private: private:
@ -536,6 +538,7 @@ static inline bool operator<(const QSize &lhs, const QSize &rhs)
return false; return false;
} }
#ifndef QT_NO_WIDGETS
void tst_QIcon::task184901_badCache() void tst_QIcon::task184901_badCache()
{ {
QPixmap pm(QFINDTESTDATA("image.png")); QPixmap pm(QFINDTESTDATA("image.png"));
@ -548,6 +551,7 @@ void tst_QIcon::task184901_badCache()
//the disabled icon must now be the same as the normal one. //the disabled icon must now be the same as the normal one.
QVERIFY( icon.pixmap(32, QIcon::Normal).toImage() == icon.pixmap(32, QIcon::Disabled).toImage() ); QVERIFY( icon.pixmap(32, QIcon::Normal).toImage() == icon.pixmap(32, QIcon::Disabled).toImage() );
} }
#endif
void tst_QIcon::fromTheme() void tst_QIcon::fromTheme()
{ {