kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Qt6: fix possible build failure with Qt 6.5

Browse Source 
Forum thread: https://forum.freecad.org/viewtopic.php?p=692199#p692199
This commit is contained in:
wmayer
2023-07-10 22:28:43 +02:00
committed by Chris Hennes
parent 713bc349a5
commit 141b2ecf0a
6 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Gui/ProgressDialog.cpp
View File

@@ -88,7 +88,7 @@ void SequencerDialog::startStep()
if (thr != currentThread) {
d->guiThread = false;
QMetaObject::invokeMethod(d->dlg, "setRangeEx", Qt::QueuedConnection,
QGenericReturnArgument(), Q_ARG(int, 0), Q_ARG(int, (int)nTotalSteps));
Q_ARG(int, 0), Q_ARG(int, (int)nTotalSteps));
d->dlg->setModal(false);
if (nTotalSteps == 0) {
d->progressTime.start();
@@ -96,7 +96,7 @@ void SequencerDialog::startStep()
d->measureTime.start();
QMetaObject::invokeMethod(d->dlg, "setValueEx", Qt::QueuedConnection,
QGenericReturnArgument(), Q_ARG(int,0));
Q_ARG(int,0));
QMetaObject::invokeMethod(d->dlg, "aboutToShow", Qt::QueuedConnection);
}
else {
@@ -174,7 +174,7 @@ void SequencerDialog::setValue(int step)
d->progressTime.restart();
if (thr != currentThread) {
QMetaObject::invokeMethod(d->dlg, "setValueEx", Qt::/*Blocking*/QueuedConnection,
QGenericReturnArgument(), Q_ARG(int,d->dlg->value()+1));
Q_ARG(int,d->dlg->value()+1));
}
else {
d->dlg->setValueEx(d->dlg->value()+1);
@@ -185,7 +185,7 @@ void SequencerDialog::setValue(int step)
else {
if (thr != currentThread) {
QMetaObject::invokeMethod(d->dlg, "setValueEx", Qt::/*Blocking*/QueuedConnection,
QGenericReturnArgument(), Q_ARG(int,step));
Q_ARG(int,step));
if (d->dlg->isVisible())
showRemainingTime();
}
@@ -222,7 +222,6 @@ void SequencerDialog::showRemainingTime()
if (thr != currentThread) {
QMetaObject::invokeMethod(d->dlg, "setLabelText",
Qt::/*Blocking*/QueuedConnection,
QGenericReturnArgument(),
Q_ARG(QString,status));
}
else {
@@ -241,7 +240,6 @@ void SequencerDialog::resetData()
QMetaObject::invokeMethod(d->dlg, "hide", Qt::QueuedConnection);
QMetaObject::invokeMethod(d->dlg, "setLabelText",
Qt::/*Blocking*/QueuedConnection,
QGenericReturnArgument(),
Q_ARG(QString,QString()));
}
else {
@@ -279,7 +277,6 @@ void SequencerDialog::setText (const char* pszTxt)
if (thr != currentThread) {
QMetaObject::invokeMethod(d->dlg, "setLabelText",
Qt::/*Blocking*/QueuedConnection,
QGenericReturnArgument(),
Q_ARG(QString,d->text));
}
else {