From 74494ea29ebc6e152348ed6a6c1e2c9399ddb204 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 12 Mar 2013 14:38:21 +0100 Subject: Fix building of the manual tests. Adapt to API-changes, exclude network/SSL-tests for Windows. Change-Id: I80d5ef1bd81e149a2f04fa7644376a8a88b1f7b9 Reviewed-by: Frederik Gladhorn --- tests/manual/qlocale/calendar.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/manual/qlocale') diff --git a/tests/manual/qlocale/calendar.cpp b/tests/manual/qlocale/calendar.cpp index d91e181461..d7ac33e6a4 100644 --- a/tests/manual/qlocale/calendar.cpp +++ b/tests/manual/qlocale/calendar.cpp @@ -397,9 +397,9 @@ void CalendarWidget::createTextFormatsGroupBox() QComboBox *CalendarWidget::createColorComboBox() { QComboBox *comboBox = new QComboBox; - comboBox->addItem(tr("Red"), Qt::red); - comboBox->addItem(tr("Blue"), Qt::blue); - comboBox->addItem(tr("Black"), Qt::black); - comboBox->addItem(tr("Magenta"), Qt::magenta); + comboBox->addItem(tr("Red"), QColor(Qt::red)); + comboBox->addItem(tr("Blue"), QColor(Qt::blue)); + comboBox->addItem(tr("Black"), QColor(Qt::black)); + comboBox->addItem(tr("Magenta"), QColor(Qt::magenta)); return comboBox; } -- cgit v1.2.3