Skip to content

Improve qt.cfg: unreadVariable for macro parameter #4683

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
danmar merged 15 commits into from
Jan 7, 2023
Merged

Improve qt.cfg: unreadVariable for macro parameter #4683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fbd3e9e
Improve qt.cfg: unreadVariable for macro parameter
chrchr-github Jan 5, 2023
687d4e6
Add QByteArrayLiteral()
chrchr-github Jan 5, 2023
ed2ddb8
Missing include
chrchr-github Jan 5, 2023
7dabb52
Add Qt5Test
chrchr-github Jan 5, 2023
5d6ada1
Revert "Add Qt5Test"
chrchr-github Jan 5, 2023
2ce2dfb
Install missing package
chrchr-github Jan 5, 2023
d85a33f
Fix package name
chrchr-github Jan 5, 2023
3866a0e
Revert "Fix package name"
chrchr-github Jan 5, 2023
e71958a
Revert "Install missing package"
chrchr-github Jan 5, 2023
cef0783
Try different include
chrchr-github Jan 5, 2023
9e8d4c2
Revert "Revert "Add Qt5Test""
chrchr-github Jan 5, 2023
b6c82e7
Revert "Try different include"
chrchr-github Jan 5, 2023
2ba43df
Change placeholder
chrchr-github Jan 5, 2023
243d490
Add quotes
chrchr-github Jan 5, 2023
860d481
Use @
chrchr-github Jan 5, 2023
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
9 changes: 5 additions & 4 deletions cfg/qt.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5179,15 +5179,15 @@
<define name="QT_TRANSLATE_NOOP3_UTF8(scope, x, comment)" value="{x, comment}"/>
<define name="QCOMPARE(actual, expected)" value="(void)((actual)==(expected))"/>
<define name="QVERIFY(condition)" value="(void)(condition)"/>
<define name="QVERIFY2(condition, message)" value="(void)(condition)"/>
<define name="QVERIFY2(condition, message)" value="(void)(condition),(void)(message)"/>
<define name="QBENCHMARK_ONCE" value=""/>
<define name="QBENCHMARK" value=""/>
<define name="QTRY_COMPARE(actual, expected)" value="(void)((actual)==(expected))"/>
<define name="QTRY_COMPARE_WITH_TIMEOUT(actual, expected, timeout)" value="(void)((actual)==(expected))"/>
<define name="QTRY_VERIFY2(condition, message)" value="(void)(condition)"/>
<define name="QTRY_VERIFY2(condition, message)" value="(void)(condition),(void)(message)"/>
<define name="QTRY_VERIFY(condition)" value="(void)(condition)"/>
<define name="QTRY_VERIFY2_WITH_TIMEOUT(condition, message, timeout)" value="(void)(condition)"/>
<define name="QTRY_VERIFY_WITH_TIMEOUT(condition, timeout)" value="(void)(condition)"/>
<define name="QTRY_VERIFY2_WITH_TIMEOUT(condition, message, timeout)" value="(void)(condition),(void)(message),(void)(timeout)"/>
<define name="QTRY_VERIFY_WITH_TIMEOUT(condition, timeout)" value="(void)(condition),(void)(timeout)"/>
<define name="QTEST_GUILESS_MAIN(testclass)" value=""/>
<define name="QTEST_APPLESS_MAIN(testclass)" value=""/>
<define name="QTEST_MAIN(testclass)" value=""/>
Expand Down Expand Up @@ -5215,6 +5215,7 @@
<define name="QT_FORWARD_DECLARE_STRUCT(name)" value="struct name;"/>
<!-- https://doc.qt.io/qt-5/qstring.html#QStringLiteral -->
<define name="QStringLiteral(str)" value="QString::fromUtf8(str, sizeof(str) - 1)"/>
<define name="QByteArrayLiteral(str)" value="QByteArray(str)"/>
<!-- https://doc.qt.io/qt-5/qtglobal.html#qreal-typedef -->
<define name="qreal" value="double"/>
<podtype name="qint8" sign="s" size="1"/>
Expand Down
8 changes: 8 additions & 0 deletions test/cfg/qt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <cstdio>
#include <QCoreApplication>
#include <QLoggingCategory>
#include <QTest>


void QString1(QString s)
Expand Down Expand Up @@ -412,6 +413,13 @@ void MacroTest2_test()
#endif
}

void MacroTest3()
{
QByteArray message = QByteArrayLiteral("Test1");
message += QByteArrayLiteral("Test2");
QVERIFY2(2 >= 0, message.constData());
}

void validCode(int * pIntPtr, QString & qstrArg)
{
if (QFile::exists("test")) {}
Expand Down
6 changes: 3 additions & 3 deletions test/cfg/runtests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ CC_OPT='-Wno-format -Wno-stringop-overread -Wno-nonnull -Wno-implicit-function-d

function get_pkg_config_cflags {
set +e
PKGCONFIG=$(pkg-config --cflags $1)
PKGCONFIG=$(pkg-config --cflags "$@")
PKGCONFIG_RETURNCODE=$?
set -e
if [ $PKGCONFIG_RETURNCODE -ne 0 ]; then
Expand All @@ -60,9 +60,9 @@ function gnu_fn {
# qt.cpp
function qt_fn {
if [ $HAS_PKG_CONFIG -eq 1 ]; then
QTCONFIG=$(get_pkg_config_cflags Qt5Core)
QTCONFIG=$(get_pkg_config_cflags Qt5Core Qt5Test)
if [ -n "$QTCONFIG" ]; then
QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt5Core)
QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt5Core Qt5Test)
[[ $QTBUILDCONFIG =~ (^|[[:space:]])reduce_relocations($|[[:space:]]) ]] && QTCONFIG="${QTCONFIG} -fPIC"
set +e
echo -e "#include <QString>" | ${CXX} ${CXX_OPT} ${QTCONFIG} -x c++ -
Expand Down