Skip to content

Commit

Permalink
Fix disabling QEXPECT_FAIL in tst_qlineedit for VxWorks
Browse files Browse the repository at this point in the history
Amends 3e1d584, in which I failed to replace "#ifdef" with "#if
defined" when adding condition to turn off QEXPECT_FAIL for VxWorks in
tst_QLineEdit::testQuickSelectionWithMouse test function. This ends up
with additional warning from compilers ("extra tokens at end of #ifdef
directive" from both clang and gcc), and ignoring check for
Q_OS_VXWORKS, causing 3e1d584 patch effectively not changing
anything.

Fix this by replacing "#ifdef Q_PROCESSOR_ARM_32" with proper "#if
defined(Q_PROCESSOR_ARM_32)".

Task-number: QTBUG-115777
Task-number: QTBUG-131362
Change-Id: I915789ece497879d557e95bc7ded51116d6ea167
Reviewed-by: Volker Hilsheimer <[email protected]>
  • Loading branch information
Michał Łoś committed Nov 22, 2024
1 parent 0da34e6 commit bc99725
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5049,7 +5049,7 @@ void tst_QLineEdit::testQuickSelectionWithMouse()
QVERIFY(lineEdit.selectedText().endsWith(suffix));
QTest::mouseMove(lineEdit.windowHandle(), center + QPoint(20, 0));
qCDebug(lcTests) << "Selected text:" << lineEdit.selectedText();
#ifdef Q_PROCESSOR_ARM_32 && !defined(Q_OS_VXWORKS)
#if defined(Q_PROCESSOR_ARM_32) && !defined(Q_OS_VXWORKS)
QEXPECT_FAIL("", "Currently fails on gcc-armv7, needs investigation.", Continue);
#endif
QCOMPARE(lineEdit.selectedText(), partialSelection);
Expand Down

0 comments on commit bc99725

Please sign in to comment.