Port away from deprecated methods since Qt 5.14

wilder
David Faure 7 years ago
parent 0d77e9461d
commit 75e2ab627f
  1. 2
      autotests/bihash/benchmarks.cpp
  2. 4
      autotests/proxymodeltestsuite/modeltest.cpp

@ -97,7 +97,7 @@ class BiHashBenchmarks : public QObject
public: public:
BiHashBenchmarks(QObject *parent = 0) BiHashBenchmarks(QObject *parent = 0)
{ {
qsrand(QDateTime::currentDateTime().toTime_t()); qsrand(QDateTime::currentDateTime().toSecsSinceEpoch());
} }
private: private:

@ -464,12 +464,12 @@ void ModelTest::data()
} }
// General Purpose roles that should return a QColor // General Purpose roles that should return a QColor
QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundColorRole ); QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundRole );
if ( colorVariant.isValid() ) { if ( colorVariant.isValid() ) {
QVERIFY( colorVariant.canConvert<QColor>() ); QVERIFY( colorVariant.canConvert<QColor>() );
} }
colorVariant = model->data ( model->index ( 0, 0 ), Qt::TextColorRole ); colorVariant = model->data ( model->index ( 0, 0 ), Qt::ForegroundRole );
if ( colorVariant.isValid() ) { if ( colorVariant.isValid() ) {
QVERIFY( colorVariant.canConvert<QColor>() ); QVERIFY( colorVariant.canConvert<QColor>() );
} }

Loading…
Cancel
Save