Skip to content

qt.cfg: Added support for QtRegion #6148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
firewave merged 4 commits into from
Mar 18, 2024
Merged

qt.cfg: Added support for QtRegion #6148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13983a3
qt.cfg: Added support for QtRegion
orbitcowboy Mar 18, 2024
255542b
Attempt to fix missing dependency
orbitcowboy Mar 18, 2024
badf815
Added 'Qt5Gui' to the list of components in qt_fn() in runtests.sh.
orbitcowboy Mar 18, 2024
4284172
Fixed syntax error in test case
orbitcowboy Mar 18, 2024
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 cfg/qt.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5242,6 +5242,7 @@
<check>QRect</check>
<check>QSize</check>
<check>QPoint</check>
<check>QRegion</check>
</unusedvar>
<operatorEqVarError>
<suppress>QMutex</suppress>
Expand Down
42 changes: 31 additions & 11 deletions test/cfg/qt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <QLoggingCategory>
#include <QTest>
#include <QRectF>
#include <QRegion>
#include <QSizeF>
#include <QPointF>
#include <QRect>
Expand All @@ -32,6 +33,24 @@

#include <cstdio>

void unreadVariable_QRegion(const int x, const QRegion::RegionType type, const QPolygon &polygon, const QBitmap &bm, const QRegion &region, const Qt::FillRule fillRule)
{
// cppcheck-suppress unreadVariable
QRegion a;
// cppcheck-suppress unreadVariable
QRegion b{};
// cppcheck-suppress unreadVariable
QRegion c{x,x,x,x};
// cppcheck-suppress unreadVariable
QRegion d{x,x,x,x, type};
// cppcheck-suppress unreadVariable
QRegion e{polygon, fillRule};
// cppcheck-suppress unreadVariable
QRegion f{bm};
// cppcheck-suppress unreadVariable
QRegion g{region};
}

void unreadVariable_QPoint(const QPoint &s)
{
// cppcheck-suppress unreadVariable
Expand Down Expand Up @@ -721,14 +740,15 @@ bool knownConditionTrueFalse_QString_count(const QString& s) // #11036

void unusedVariable_qtContainers() // #10689
{
// cppcheck-suppress unusedVariable
QMap<int, int> qm;
// cppcheck-suppress unusedVariable
QSet<int> qs;
// cppcheck-suppress unusedVariable
QMultiMap<int, int> qmm;
// cppcheck-suppress unusedVariable
QQueue<int> qq;
// cppcheck-suppress unusedVariable
QLatin1String ql1s;
}
// cppcheck-suppress unusedVariable
QMap<int, int> qm;
// cppcheck-suppress unusedVariable
QSet<int> qs;
// cppcheck-suppress unusedVariable
QMultiMap<int, int> qmm;
// cppcheck-suppress unusedVariable
QQueue<int> qq;
// cppcheck-suppress unusedVariable
QLatin1String ql1s;
}

4 changes: 2 additions & 2 deletions test/cfg/runtests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ function gnu_fn {
# qt.cpp
function qt_fn {
if [ $HAS_PKG_CONFIG -eq 1 ]; then
QTCONFIG=$(get_pkg_config_cflags Qt5Core Qt5Test)
QTCONFIG=$(get_pkg_config_cflags Qt5Core Qt5Test Qt5Gui)
if [ -n "$QTCONFIG" ]; then
QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt5Core Qt5Test)
QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt5Core Qt5Test Qt5Gui)
[[ $QTBUILDCONFIG =~ (^|[[:space:]])reduce_relocations($|[[:space:]]) ]] && QTCONFIG="${QTCONFIG} -fPIC"
# TODO: get rid of the error enabling/disabling?
set +e
Expand Down