diff --git a/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp b/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp index c48d8a52190..7be5f04ff17 100644 --- a/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp +++ b/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp @@ -64,7 +64,7 @@ void DebugMessagesModelTest::testColor() // TimelineModel::colorBySelectionId ... for (int i = 0; i < 10; ++i) { QCOMPARE(model.color(i), - QColor::fromHsl((i % (QtMsgType::QtInfoMsg + 1) * 25) % 360, 150, 166)); + QColor::fromHsl((i % (QtMsgType::QtInfoMsg + 1) * 25) % 360, 150, 166).rgb()); } } diff --git a/src/plugins/qmlprofiler/tests/inputeventsmodel_test.cpp b/src/plugins/qmlprofiler/tests/inputeventsmodel_test.cpp index f0212b66a36..c67856bc03b 100644 --- a/src/plugins/qmlprofiler/tests/inputeventsmodel_test.cpp +++ b/src/plugins/qmlprofiler/tests/inputeventsmodel_test.cpp @@ -74,15 +74,15 @@ void InputEventsModelTest::testTypeId() void InputEventsModelTest::testColor() { - QColor keyColor; - QColor mouseColor; + QRgb keyColor = 0; + QRgb mouseColor = 0; for (int i = 0; i < 10; ++i) { InputEventType type = static_cast(i % MaximumInputEventType); int selectionId = (type <= InputKeyUnknown ? Key : Mouse); QCOMPARE(selectionId, model.selectionId(i)); - QColor &expectedColor = selectionId == Key ? keyColor : mouseColor; - if (expectedColor.isValid()) + QRgb &expectedColor = selectionId == Key ? keyColor : mouseColor; + if (expectedColor != 0) QCOMPARE(model.color(i), expectedColor); else expectedColor = model.color(i); diff --git a/src/plugins/qmlprofiler/tests/memoryusagemodel_test.cpp b/src/plugins/qmlprofiler/tests/memoryusagemodel_test.cpp index 274f3a9c011..b561074bf88 100644 --- a/src/plugins/qmlprofiler/tests/memoryusagemodel_test.cpp +++ b/src/plugins/qmlprofiler/tests/memoryusagemodel_test.cpp @@ -122,9 +122,9 @@ void MemoryUsageModelTest::testTypeId() void MemoryUsageModelTest::testColor() { - QColor heapPageColor = model.color(0); - QColor smallItemColor = model.color(1); - QColor largeItemColor = model.color(2); + QRgb heapPageColor = model.color(0); + QRgb smallItemColor = model.color(1); + QRgb largeItemColor = model.color(2); QVERIFY(smallItemColor != heapPageColor); QVERIFY(largeItemColor != heapPageColor); QVERIFY(smallItemColor != largeItemColor); diff --git a/src/plugins/qmlprofiler/tests/pixmapcachemodel_test.cpp b/src/plugins/qmlprofiler/tests/pixmapcachemodel_test.cpp index 8332904f876..069de0cca1c 100644 --- a/src/plugins/qmlprofiler/tests/pixmapcachemodel_test.cpp +++ b/src/plugins/qmlprofiler/tests/pixmapcachemodel_test.cpp @@ -270,20 +270,20 @@ void PixmapCacheModelTest::testRowMaxValue() void PixmapCacheModelTest::testColor() { - QColor row1Color; - QColor dingsColor; - QColor blahColor; + QRgb row1Color = 0; + QRgb dingsColor = 0; + QRgb blahColor = 0; for (int i = 0; i < model.count(); ++i) { if (model.collapsedRow(i) == 1) { - if (!row1Color.isValid()) + if (row1Color == 0) row1Color = model.color(i); else QCOMPARE(model.color(i), row1Color); } else { const QmlEventType &type = manager.qmlModel()->eventTypes()[model.typeId(i)]; - QColor &pixmapColor = (type.location().filename() == QString("blah.png")) ? + QRgb &pixmapColor = (type.location().filename() == QString("blah.png")) ? blahColor : dingsColor; - if (!pixmapColor.isValid()) + if (pixmapColor == 0) pixmapColor = model.color(i); else QCOMPARE(model.color(i), pixmapColor);