Avoid using 'check' as an identifier.
Avoids conflict with macro on Mac OS. Change-Id: I79d78283b45bc97032d6a94139ee750ec01e9c0a Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
parent
4fe9ff1001
commit
acdd5fecb7
@ -855,7 +855,7 @@ public:
|
||||
void cleanupPage() { ++cleanup; QWizardPage::cleanupPage(); }
|
||||
bool validatePage() { ++validate; return QWizardPage::validatePage(); }
|
||||
|
||||
bool check(int init, int cleanup)
|
||||
bool sanityCheck(int init, int cleanup)
|
||||
{
|
||||
return init == this->init
|
||||
&& cleanup == this->cleanup
|
||||
@ -868,9 +868,9 @@ public:
|
||||
};
|
||||
|
||||
#define CHECK_PAGE_INIT(i0, c0, i1, c1, i2, c2) \
|
||||
QVERIFY(page0->check((i0), (c0))); \
|
||||
QVERIFY(page1->check((i1), (c1))); \
|
||||
QVERIFY(page2->check((i2), (c2)));
|
||||
QVERIFY(page0->sanityCheck((i0), (c0))); \
|
||||
QVERIFY(page1->sanityCheck((i1), (c1))); \
|
||||
QVERIFY(page2->sanityCheck((i2), (c2)));
|
||||
|
||||
void tst_QWizard::setOption_IndependentPages()
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user