diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-03-12 14:38:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 06:23:27 +0100 |
| commit | 74494ea29ebc6e152348ed6a6c1e2c9399ddb204 (patch) | |
| tree | a2e32e5c4202758a5f6b3fbbd985666735f47372 /tests/manual/qlocale/calendar.cpp | |
| parent | 3372b0faa74114184afbfde20a3bc27049df2c94 (diff) | |
Fix building of the manual tests.
Adapt to API-changes, exclude network/SSL-tests for Windows.
Change-Id: I80d5ef1bd81e149a2f04fa7644376a8a88b1f7b9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'tests/manual/qlocale/calendar.cpp')
| -rw-r--r-- | tests/manual/qlocale/calendar.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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; } |