diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 13:24:37 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 13:26:27 +0200 |
| commit | c5ea7fd39a737ee16e82a6ef49a3149758b96e2b (patch) | |
| tree | f14c1b1c25661bbd78f8ffb1de9a3c64a5319232 /tests/auto/qmessagebox | |
| parent | 94355ca15a4d451f4a4b858240e2c1a96e26537b (diff) | |
Fix autotests to build on Windows.
Basically breakage by <windows.h> being included from the OpenGL
parts of <QtGui/QtGui> included from <QtTest/QtTest>.
Change-Id: Id285fb89c64bf77e2408faac5688acd085579351
Reviewed-on: http://codereview.qt.nokia.com/3952
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/qmessagebox')
| -rw-r--r-- | tests/auto/qmessagebox/tst_qmessagebox.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/qmessagebox/tst_qmessagebox.cpp index 6b737681b1..12b6029a8f 100644 --- a/tests/auto/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/qmessagebox/tst_qmessagebox.cpp @@ -525,8 +525,9 @@ void tst_QMessageBox::testSymbols() button = QMessageBox::Escape; button = QMessageBox::FlagMask; - mb1.setText("Foo"); - QCOMPARE(mb1.text(), "Foo"); + const QString text = QStringLiteral("Foo"); + mb1.setText(text); + QCOMPARE(mb1.text(), text); icon = mb1.icon(); QVERIFY(icon == QMessageBox::NoIcon); @@ -537,26 +538,28 @@ void tst_QMessageBox::testSymbols() mb1.setIconPixmap(iconPixmap); QVERIFY(mb1.icon() == QMessageBox::NoIcon); - QCOMPARE(mb1.buttonText(QMessageBox::Ok), "OK"); + QCOMPARE(mb1.buttonText(QMessageBox::Ok), QLatin1String("OK")); QCOMPARE(mb1.buttonText(QMessageBox::Cancel), QString()); QCOMPARE(mb1.buttonText(QMessageBox::Ok | QMessageBox::Default), QString()); - mb2.setButtonText(QMessageBox::Cancel, "Foo"); - mb2.setButtonText(QMessageBox::Ok, "Bar"); - mb2.setButtonText(QMessageBox::Ok | QMessageBox::Default, "Baz"); + const QString button1 = QStringLiteral("Bar"); + mb2.setButtonText(QMessageBox::Cancel, QStringLiteral("Foo")); + mb2.setButtonText(QMessageBox::Ok, button1); + mb2.setButtonText(QMessageBox::Ok | QMessageBox::Default, QStringLiteral("Baz")); QCOMPARE(mb2.buttonText(QMessageBox::Cancel), QString()); - QCOMPARE(mb2.buttonText(QMessageBox::Ok), "Bar"); + QCOMPARE(mb2.buttonText(QMessageBox::Ok), button1); QVERIFY(mb3b.buttonText(QMessageBox::Yes).endsWith("Yes")); QCOMPARE(mb3b.buttonText(QMessageBox::YesAll), QString()); QCOMPARE(mb3b.buttonText(QMessageBox::Ok), QString()); - mb3b.setButtonText(QMessageBox::Yes, "Blah"); - mb3b.setButtonText(QMessageBox::YesAll, "Zoo"); - mb3b.setButtonText(QMessageBox::Ok, "Zoo"); + const QString button2 = QStringLiteral("Blah"); + mb3b.setButtonText(QMessageBox::Yes, button2); + mb3b.setButtonText(QMessageBox::YesAll, QStringLiteral("Zoo")); + mb3b.setButtonText(QMessageBox::Ok, QStringLiteral("Zoo")); - QCOMPARE(mb3b.buttonText(QMessageBox::Yes), "Blah"); + QCOMPARE(mb3b.buttonText(QMessageBox::Yes), button2); QCOMPARE(mb3b.buttonText(QMessageBox::YesAll), QString()); QCOMPARE(mb3b.buttonText(QMessageBox::Ok), QString()); |