summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDebao Zhang <hello@debao.me>2013-03-25 17:46:53 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-27 06:01:11 +0100
commit90d74f86029d4761babf046056ff8647536fc348 (patch)
tree71074b45ae6d32b9325af6d18ad846133a37346c /tests
parentf57a3c0ba3e0747604a23de00e740a6547d07cdf (diff)
QtWidgets tests: Don't call the empty function QApplication::syncX()
Change-Id: I2c732afd43586209cf5a2b72caac53e34abb9090 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp8
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp1
-rw-r--r--tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp1
-rw-r--r--tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp1
-rw-r--r--tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp2
-rw-r--r--tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp1
-rw-r--r--tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp1
7 files changed, 0 insertions, 15 deletions
diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
index 749687aef5..b4042a5857 100644
--- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
+++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
@@ -328,7 +328,6 @@ void tst_QDialog::showFullScreen()
QVERIFY(sizeGrip);
#endif
- qApp->syncX();
dialog.showFullScreen();
QVERIFY(dialog.isFullScreen());
QVERIFY(dialog.isVisible());
@@ -336,7 +335,6 @@ void tst_QDialog::showFullScreen()
QVERIFY(!sizeGrip->isVisible());
#endif
- qApp->syncX();
dialog.showNormal();
QVERIFY(!dialog.isFullScreen());
QVERIFY(dialog.isVisible());
@@ -344,32 +342,26 @@ void tst_QDialog::showFullScreen()
QVERIFY(sizeGrip->isVisible());
#endif
- qApp->syncX();
dialog.showFullScreen();
QVERIFY(dialog.isFullScreen());
QVERIFY(dialog.isVisible());
- qApp->syncX();
dialog.hide();
QVERIFY(dialog.isFullScreen());
QVERIFY(!dialog.isVisible());
- qApp->syncX();
dialog.show();
QVERIFY(dialog.isFullScreen());
QVERIFY(dialog.isVisible());
- qApp->syncX();
dialog.hide();
QVERIFY(dialog.isFullScreen());
QVERIFY(!dialog.isVisible());
- qApp->syncX();
dialog.showFullScreen();
QVERIFY(dialog.isFullScreen());
QVERIFY(dialog.isVisible());
- qApp->syncX();
dialog.hide();
QVERIFY(dialog.isFullScreen());
QVERIFY(!dialog.isVisible());
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 0a7a06f445..5e37c12fbf 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -1068,7 +1068,6 @@ void tst_QFiledialog::focus()
// make sure the tests work with focus follows mouse
QCursor::setPos(fd.geometry().center());
- QApplication::syncX();
QList<QWidget*> treeView = qFindChildren<QWidget*>(&fd, "fileNameEdit");
QCOMPARE(treeView.count(), 1);
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index f0731eb3a6..5afc33f884 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
@@ -1048,7 +1048,6 @@ void tst_QAbstractItemView::setItemDelegate()
v.show();
#ifdef Q_WS_X11
QCursor::setPos(v.geometry().center());
- QApplication::syncX();
#endif
QApplication::setActiveWindow(&v);
QVERIFY(QTest::qWaitForWindowActive(&v));
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 52cd1051ba..b92a6ed222 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -316,7 +316,6 @@ void tst_QApplication::alert()
widget.activateWindow();
QApplication::setActiveWindow(&widget);
app.alert(&widget, 200);
- app.syncX();
}
void tst_QApplication::multiple_data()
diff --git a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp
index 1958ebfab1..962fd3a8ab 100644
--- a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp
+++ b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp
@@ -610,7 +610,6 @@ void tst_QShortcut::disabledItems()
{
clearAllShortcuts();
mainW->activateWindow();
- qApp->syncX();
QTest::qWait(100);
/* Testing Disabled Shortcuts
@@ -1072,7 +1071,6 @@ void tst_QShortcut::context()
// Changing focus to 'other2' should make the Focus context there work
other2->activateWindow();
other2->setFocus(); // ###
- qApp->syncX();
QTRY_COMPARE(qApp->activeWindow(), other2->window());
QCOMPARE(qApp->focusWidget(), (QWidget *)other2);
diff --git a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
index c4c8022237..9ab7bb5305 100644
--- a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
+++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
@@ -132,7 +132,6 @@ void tst_QStackedLayout::init()
// make sure the tests work with focus follows mouse
QCursor::setPos(testWidget->geometry().center());
testWidget->activateWindow();
- QApplication::syncX();
QTest::qWait(250);
}
diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
index 519aa61061..d1e6693608 100644
--- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
@@ -294,7 +294,6 @@ void tst_QMenuBar::initSimpleMenubar()
connect(pm2, SIGNAL(triggered(QAction*)), this, SLOT(onActivated(QAction*)));
mb->show();
- qApp->syncX();
qApp->processEvents();
}