Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ daisuke-chiba
Daniel Friedrich
David Korczynski
Daniel Marjamäki
Daschle Newberry
David Hallas
David Korth
Dávid Slivka
Expand Down
2 changes: 1 addition & 1 deletion cfg/qt.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5520,7 +5520,7 @@
<define name="Q_OVERRIDE(x)" value=""/>
<define name="Q_PLUGIN_METADATA(x)" value=""/>
<define name="Q_ASSERT(condition)" value="assert(condition)"/>
<define name="Q_ASSERT_X(condition, where, what)" value="assert(condition)"/>
<define name="Q_ASSERT_X(condition, where, what)" value="assert(condition); (void)(where); (void)(what)"/>
<define name="QTC_ASSERT_STRINGIFY_HELPER(x)" value="#x"/>
<define name="QTC_ASSERT_STRINGIFY(x)" value="QTC_ASSERT_STRINGIFY_HELPER(x)"/>
<define name="QTC_ASSERT_STRING(cond)" value="::Utils::writeAssertLocation( &quot;\&quot;&quot; cond&quot;\&quot; in file &quot; __FILE__ &quot;, line &quot; QTC_ASSERT_STRINGIFY(__LINE__))"/>
Expand Down
7 changes: 7 additions & 0 deletions test/cfg/qt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,13 @@ int qdateIsValid()
return qd.month();
}

void qAssertX()
{
const char *where = "test";
const char *what = "assertion failed";
Q_ASSERT_X(false, where, what);
}

struct S_QTimer_connect : QObject { // #13846
S_QTimer_connect() {
// cppcheck-suppress checkLibraryFunction - timeout() is a signal from QTimer
Expand Down