AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtbase tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0 for simple cases.

Browse Source 
Fix usage of API that is marked deprecated.

Change-Id: Ie31b6ee029c5b5f015fe52fb9bcd8e94b22d6cd0
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2015-08-24 13:35:22 +02:00
parent 1ca789bfe3
commit 50b9e30970
27 changed files with 32 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro
View File

@ -7,4 +7,3 @@ INCLUDEPATH += $$PWD/$${mtdir}
QT += testlib
SOURCES += tst_qidentityproxymodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp
HEADERS += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

1
tests/auto/corelib/itemmodels/qitemselectionmodel/qitemselectionmodel.pro
View File

@ -3,4 +3,3 @@ CONFIG += parallel_test
TARGET = tst_qitemselectionmodel
QT += testlib
SOURCES += tst_qitemselectionmodel.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

2
tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
View File

@ -1512,7 +1512,7 @@ class MyStandardItemModel: public QStandardItemModel
Q_OBJECT
public:
inline MyStandardItemModel(int i1, int i2): QStandardItemModel(i1, i2) {}
inline void reset() { QStandardItemModel::reset(); }
inline void reset() { beginResetModel(); endResetModel(); }
};
void tst_QItemSelectionModel::resetModel()

1
tests/auto/corelib/itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro
View File

@ -8,4 +8,3 @@ mtdir = ../../../other/modeltest
INCLUDEPATH += $$PWD/$${mtdir}
SOURCES += tst_qsortfilterproxymodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp
HEADERS += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

7
tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
View File

@ -2581,7 +2581,7 @@ void tst_QSortFilterProxyModel::hiddenColumns()
public:
MyStandardItemModel() : QStandardItemModel(0,5) {}
void reset()
{ QStandardItemModel::reset(); }
{ beginResetModel(); endResetModel(); }
friend class tst_QSortFilterProxyModel;
} model;
QSortFilterProxyModel proxy;
@ -3377,7 +3377,10 @@ void tst_QSortFilterProxyModel::resetInvalidate()
{
switch (test) {
case 0: break;
case 1: reset(); break;
case 1:
beginResetModel();
endResetModel();
break;
case 2: invalidate(); break;
case 3: invalidateFilter(); break;
}

1
tests/auto/gui/kernel/qkeysequence/qkeysequence.pro
View File

@ -8,4 +8,3 @@ QT += core-private gui-private
SOURCES += tst_qkeysequence.cpp
RESOURCES += qkeysequence.qrc
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

4
tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
View File

@ -250,7 +250,7 @@ void tst_QKeySequence::operatorQString()
seq = QKeySequence( modifiers | keycode );
QCOMPARE( (QString)seq, keystring );
QCOMPARE( seq.toString(QKeySequence::NativeText), keystring );
}
// this verifies that the constructors can handle the same strings in and out
@ -260,7 +260,7 @@ void tst_QKeySequence::symetricConstructors()
QFETCH( int, keycode );
QKeySequence seq1( modifiers | keycode );
QKeySequence seq2( (QString)seq1 );
QKeySequence seq2( seq1.toString(QKeySequence::NativeText) );
QVERIFY( seq1 == seq2 );
}

1
tests/auto/gui/painting/qpainter/qpainter.pro
View File

@ -9,7 +9,6 @@ SOURCES += tst_qpainter.cpp
TESTDATA += drawEllipse/* drawLine_rop_bitmap/* drawPixmap_rop/* drawPixmap_rop_bitmap/* \
task217400.png
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
android: !android-no-sdk {
RESOURCES += \

2
tests/auto/gui/painting/qpainter/tst_qpainter.cpp
View File

@ -4487,7 +4487,7 @@ void tst_QPainter::QTBUG5939_attachPainterPrivate()
TestWidget *widget = new TestWidget();
proxy->setWidget(widget);
scene->addItem(proxy);
proxy->rotate(45);
proxy->setTransform(QTransform().rotate(45));
w->resize(scene->sceneRect().size().toSize());
w->show();

3
tests/auto/gui/text/qfont/qfont.pro
View File

@ -5,6 +5,3 @@ QT += testlib
QT += core-private gui-private
qtHaveModule(widgets): QT += widgets
SOURCES += tst_qfont.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

4
tests/auto/gui/text/qfont/tst_qfont.cpp
View File

@ -504,7 +504,7 @@ void tst_QFont::isCopyOf()
void tst_QFont::insertAndRemoveSubstitutions()
{
QFont::removeSubstitution("BogusFontFamily");
QFont::removeSubstitutions("BogusFontFamily");
// make sure it is empty before we start
QVERIFY(QFont::substitutes("BogusFontFamily").isEmpty());
QVERIFY(QFont::substitutes("bogusfontfamily").isEmpty());
@ -521,7 +521,7 @@ void tst_QFont::insertAndRemoveSubstitutions()
QCOMPARE(QFont::substitutes("BogusFontFamily").count(), 3);
QCOMPARE(QFont::substitutes("bogusfontfamily").count(), 3);
QFont::removeSubstitution("BogusFontFamily");
QFont::removeSubstitutions("BogusFontFamily");
// make sure it is empty again
QVERIFY(QFont::substitutes("BogusFontFamily").isEmpty());
QVERIFY(QFont::substitutes("bogusfontfamily").isEmpty());

1
tests/auto/other/languagechange/languagechange.pro
View File

@ -4,4 +4,3 @@ win32:testcase.timeout = 1800 # test runtime varies greatly on Windows, QTBUG-
TARGET = tst_languagechange
QT += widgets core-private gui-private testlib
SOURCES += tst_languagechange.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

2
tests/auto/other/languagechange/tst_languagechange.cpp
View File

@ -253,7 +253,7 @@ void tst_languageChange::retranslatability()
switch (dialogType) {
case InputDialog:
stateMachine.start();
QInputDialog::getInteger(0, QLatin1String("title"), QLatin1String("label"));
QInputDialog::getInt(0, QLatin1String("title"), QLatin1String("label"));
break;
case ColorDialog:

3
tests/auto/other/modeltest/dynamictreemodel.cpp
View File

@ -299,7 +299,8 @@ bool ModelResetCommand::emitPreSignal(const QModelIndex &srcParent, int srcStart
void ModelResetCommand::emitPostSignal()
{
m_model->reset();
m_model->beginResetModel();
m_model->endResetModel();
}
ModelResetCommandFixed::ModelResetCommandFixed(DynamicTreeModel* model, QObject* parent)

4
tests/auto/other/modeltest/modeltest.pro
View File

@ -3,7 +3,3 @@ TARGET = tst_modeltest
QT += widgets testlib
SOURCES += tst_modeltest.cpp modeltest.cpp dynamictreemodel.cpp
HEADERS += modeltest.h dynamictreemodel.h
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

1
tests/auto/other/qaccessibility/qaccessibility.pro
View File

@ -21,4 +21,3 @@ win32 {
LIBS += -luuid
!winphone: LIBS += -loleacc -loleaut32 -lole32
}
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

6
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
View File

@ -1763,7 +1763,7 @@ void tst_QAccessibility::textEditTest()
}
edit.show();
QTest::qWaitForWindowShown(&edit);
QTest::qWaitForWindowExposed(&edit);
QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(&edit);
QCOMPARE(iface->text(QAccessible::Value), edit.toPlainText());
QVERIFY(iface->state().focusable);
@ -2175,7 +2175,7 @@ void tst_QAccessibility::lineEditTest()
QLineEdit le(QStringLiteral("My characters have geometries."), toplevel);
// characterRect()
le.show();
QTest::qWaitForWindowShown(&le);
QTest::qWaitForWindowExposed(&le);
QAccessibleInterface *iface(QAccessible::queryAccessibleInterface(&le));
QAccessibleTextInterface* textIface = iface->textInterface();
QVERIFY(textIface);
@ -3576,7 +3576,7 @@ void tst_QAccessibility::comboBoxTest()
// Fully decorated windows have a minimum width of 160 on Windows.
combo.setMinimumWidth(200);
combo.show();
QVERIFY(QTest::qWaitForWindowShown(&combo));
QVERIFY(QTest::qWaitForWindowExposed(&combo));
QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(&combo);
QCOMPARE(verifyHierarchy(iface), 0);

1
tests/benchmarks/gui/kernel/qwidget/qwidget.pro
View File

@ -2,4 +2,3 @@ QT += widgets testlib
TARGET = tst_bench_qwidget
SOURCES += tst_qwidget.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

2
tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp
View File

@ -128,7 +128,7 @@ private:
void tst_QWidget::initTestCase()
{
widget.show();
QTest::qWaitForWindowShown(&widget);
QTest::qWaitForWindowExposed(&widget);
QTest::qWait(300);
processEvents();
}

2
tests/benchmarks/gui/painting/qtbench/qtbench.pro
View File

@ -4,5 +4,3 @@ TEMPLATE = app
TARGET = tst_bench_qtbench
SOURCES += tst_qtbench.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

2
tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp
View File

@ -229,7 +229,7 @@ void tst_QtBench::qtBench()
BenchWidget widget(reinterpret_cast<Benchmark *>(benchmark));
widget.show();
QTest::qWaitForWindowShown(&widget);
QTest::qWaitForWindowExposed(&widget);
while (!widget.done()) {
widget.update();

2
tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp
View File

@ -173,7 +173,7 @@ void tst_qstylesheetstyle::grid()
w->setStyleSheet("/* */");
if(show) {
w->show();
QTest::qWaitForWindowShown(w);
QTest::qWaitForWindowExposed(w);
QApplication::flush();
QApplication::processEvents();
QTest::qWait(30);

1
tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro
View File

@ -5,4 +5,3 @@ TARGET = tst_bench_qstylesheetstyle
CONFIG += release
SOURCES += main.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

1
tests/manual/network_remote_stresstest/network_remote_stresstest.pro
View File

@ -7,4 +7,3 @@ SOURCES += tst_network_remote_stresstest.cpp
RESOURCES += url-list.qrc
LIBS += $$QMAKE_LIBS_NETWORK
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

19
tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp
View File

@ -246,30 +246,31 @@ void tst_NetworkRemoteStressTest::blockingSequentialRemoteHosts()
socket = QSharedPointer<QTcpSocket>(new QTcpSocket);
socket->connectToHost(url.host(), url.port(isHttps ? 443 : 80));
QVERIFY2(socket->waitForConnected(10000), "Timeout connecting to " + url.encodedHost());
const QByteArray encodedHost = url.host(QUrl::FullyEncoded).toLatin1();
QVERIFY2(socket->waitForConnected(10000), "Timeout connecting to " + encodedHost);
#ifndef QT_NO_SSL
if (isHttps) {
static_cast<QSslSocket *>(socket.data())->setProtocol(QSsl::TlsV1_0);
static_cast<QSslSocket *>(socket.data())->startClientEncryption();
static_cast<QSslSocket *>(socket.data())->ignoreSslErrors();
QVERIFY2(static_cast<QSslSocket *>(socket.data())->waitForEncrypted(10000), "Timeout starting TLS with " + url.encodedHost());
QVERIFY2(static_cast<QSslSocket *>(socket.data())->waitForEncrypted(10000), "Timeout starting TLS with " + encodedHost);
}
#endif // QT_NO_SSL
socket->write("GET " + url.toEncoded(QUrl::RemoveScheme | QUrl::RemoveAuthority | QUrl::RemoveFragment) + " HTTP/1.0\r\n"
"Connection: close\r\n"
"User-Agent: tst_QTcpSocket_stresstest/1.0\r\n"
"Host: " + url.encodedHost() + "\r\n"
"Host: " + encodedHost + "\r\n"
"\r\n");
while (socket->bytesToWrite())
QVERIFY2(socket->waitForBytesWritten(10000), "Timeout writing to " + url.encodedHost());
QVERIFY2(socket->waitForBytesWritten(10000), "Timeout writing to " + encodedHost);
while (socket->state() == QAbstractSocket::ConnectedState && !timeout.hasExpired(10000)) {
socket->waitForReadyRead(10000);
byteCounter += socket->readAll().size(); // discard
}
QVERIFY2(!timeout.hasExpired(10000), "Timeout reading from " + url.encodedHost());
QVERIFY2(!timeout.hasExpired(10000), "Timeout reading from " + encodedHost);
totalBytes += byteCounter;
if (intermediateDebug) {
@ -318,16 +319,17 @@ void tst_NetworkRemoteStressTest::sequentialRemoteHosts()
socket->connectToHost(url.host(), url.port(80));
}
const QByteArray encodedHost = url.host(QUrl::FullyEncoded).toLatin1();
socket->write("GET " + url.toEncoded(QUrl::RemoveScheme | QUrl::RemoveAuthority | QUrl::RemoveFragment) + " HTTP/1.0\r\n"
"Connection: close\r\n"
"User-Agent: tst_QTcpSocket_stresstest/1.0\r\n"
"Host: " + url.encodedHost() + "\r\n"
"Host: " + encodedHost + "\r\n"
"\r\n");
connect(socket.data(), SIGNAL(readyRead()), SLOT(slotReadAll()));
QTestEventLoop::instance().connect(socket.data(), SIGNAL(disconnected()), SLOT(exitLoop()));
QTestEventLoop::instance().enterLoop(30);
QVERIFY2(!QTestEventLoop::instance().timeout(), "Timeout with " + url.encodedHost() + "; "
QVERIFY2(!QTestEventLoop::instance().timeout(), "Timeout with " + encodedHost + "; "
+ QByteArray::number(socket->bytesToWrite()) + " bytes to write");
totalBytes += byteCounter;
@ -397,10 +399,11 @@ void tst_NetworkRemoteStressTest::parallelRemoteHosts()
socket->connectToHost(url.host(), url.port(isHttps ? 443 : 80));
}
const QByteArray encodedHost = url.host(QUrl::FullyEncoded).toLatin1();
socket->write("GET " + url.toEncoded(QUrl::RemoveScheme | QUrl::RemoveAuthority | QUrl::RemoveFragment) + " HTTP/1.0\r\n"
"Connection: close\r\n"
"User-Agent: tst_QTcpSocket_stresstest/1.0\r\n"
"Host: " + url.encodedHost() + "\r\n"
"Host: " + encodedHost + "\r\n"
"\r\n");
connect(socket, SIGNAL(readyRead()), SLOT(slotReadAll()));
QTestEventLoop::instance().connect(socket, SIGNAL(disconnected()), SLOT(exitLoop()));

1
tests/manual/qtabletevent/device_information/device_information.pro
View File

@ -4,4 +4,3 @@ SOURCES += \
tabletwidget.cpp
HEADERS += \
tabletwidget.h
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

2
tests/manual/qtabletevent/device_information/tabletwidget.cpp
View File

@ -61,7 +61,7 @@ bool TabletWidget::eventFilter(QObject *, QEvent *ev)
mType = event->type();
mPos = event->pos();
mGPos = event->globalPos();
mHiResGlobalPos = event->hiResGlobalPos();
mHiResGlobalPos = event->posF();
mDev = event->device();
mPointerType = event->pointerType();
mUnique = event->uniqueId();