kindred/create
1
1
Fork 0
Code Issues 53 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

2
src/Gui/DlgMacroExecuteImp.cpp
View File

@@ -620,7 +620,6 @@ Note: your changes will be applied when you next switch workbenches\n"));
workbenchBox->setCurrentIndex(globalIdx);
QMetaObject::invokeMethod(setupToolbarPage, "on_workbenchBox_activated",
Qt::DirectConnection,
QGenericReturnArgument(),
Q_ARG(int, globalIdx));
} else {
Base::Console().Warning("Toolbar walkthrough: Unable to find Global workbench\n");
@@ -656,7 +655,6 @@ Note: your changes will be applied when you next switch workbenches\n"));
categoryBox->setCurrentIndex(macrosIdx);
QMetaObject::invokeMethod(setupToolbarPage, "on_categoryBox_activated",
Qt::DirectConnection,
QGenericReturnArgument(),
Q_ARG(int, macrosIdx));
} else {
Base::Console().Warning("Toolbar walkthrough: Unable to find Macros in categoryBox\n");

2
src/Gui/DlgPreferencesImp.cpp
View File

@@ -29,7 +29,6 @@
# include <QAbstractButton>
# include <QApplication>
# include <QDebug>
# include <QGenericReturnArgument>
# include <QMessageBox>
# include <QScreen>
# include <QScrollArea>
@@ -546,7 +545,6 @@ void DlgPreferencesImp::resizeEvent(QResizeEvent* ev)
int newHeight = std::min<int>(height(), maxHeight);
QMetaObject::invokeMethod(this, "resizeWindow",
Qt::QueuedConnection,
QGenericReturnArgument(),
Q_ARG(int, newWidth),
Q_ARG(int, newHeight));
}

2
src/Gui/MainWindow.cpp
View File

@@ -1491,7 +1491,7 @@ void MainWindow::updateActions(bool delay)
// the whole application in a weird state
if (d->activityTimer->thread() != QThread::currentThread()) {
QMetaObject::invokeMethod(d->activityTimer, "start", Qt::QueuedConnection,
QGenericReturnArgument(), Q_ARG(int, 150));
Q_ARG(int, 150));
}
else {
d->activityTimer->start(150);

11
src/Gui/ProgressBar.cpp
View File

@@ -24,7 +24,6 @@
#ifndef _PreComp_
# include <QApplication>
# include <QElapsedTimer>
# include <QGenericReturnArgument>
# include <QKeyEvent>
# include <QMessageBox>
# include <QMetaObject>
@@ -143,7 +142,7 @@ void SequencerBar::startStep()
if (thr != currentThread) {
d->guiThread = false;
QMetaObject::invokeMethod(d->bar, "setRangeEx", Qt::QueuedConnection,
QGenericReturnArgument(), Q_ARG(int, 0), Q_ARG(int, (int)nTotalSteps));
Q_ARG(int, 0), Q_ARG(int, (int)nTotalSteps));
d->progressTime.start();
d->checkAbortTime.start();
d->measureTime.start();
@@ -247,7 +246,7 @@ void SequencerBar::setValue(int step)
d->progressTime.restart();
if (thr != currentThread) {
QMetaObject::invokeMethod(d->bar, "setValueEx", Qt::/*Blocking*/QueuedConnection,
QGenericReturnArgument(), Q_ARG(int,d->bar->value()+1));
Q_ARG(int,d->bar->value()+1));
}
else {
d->bar->setValueEx(d->bar->value()+1);
@@ -262,7 +261,7 @@ void SequencerBar::setValue(int step)
d->progressTime.restart();
if (thr != currentThread) {
QMetaObject::invokeMethod(d->bar, "setValueEx", Qt::/*Blocking*/QueuedConnection,
QGenericReturnArgument(), Q_ARG(int,step));
Q_ARG(int,step));
if (d->bar->isVisible())
showRemainingTime();
}
@@ -301,7 +300,6 @@ void SequencerBar::showRemainingTime()
if (thr != currentThread) {
QMetaObject::invokeMethod(getMainWindow(), "showMessage",
Qt::/*Blocking*/QueuedConnection,
QGenericReturnArgument(),
Q_ARG(QString,status));
}
else {
@@ -320,11 +318,9 @@ void SequencerBar::resetData()
QMetaObject::invokeMethod(d->bar, "aboutToHide", Qt::QueuedConnection);
QMetaObject::invokeMethod(getMainWindow(), "showMessage",
Qt::/*Blocking*/QueuedConnection,
QGenericReturnArgument(),
Q_ARG(QString,QString()));
QMetaObject::invokeMethod(getMainWindow(), "setPaneText",
Qt::/*Blocking*/QueuedConnection,
QGenericReturnArgument(),
Q_ARG(int,1),
Q_ARG(QString,QString()));
d->bar->leaveControlEvents(d->guiThread);
@@ -363,7 +359,6 @@ void SequencerBar::setText (const char* pszTxt)
if (thr != currentThread) {
QMetaObject::invokeMethod(getMainWindow(), "showMessage",
Qt::/*Blocking*/QueuedConnection,
QGenericReturnArgument(),
Q_ARG(QString,d->text));
}
else {

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 {

5
src/Mod/PartDesign/Gui/TaskPipeParameters.cpp
View File

@@ -24,7 +24,6 @@
#ifndef _PreComp_
# include <QAction>
# include <QGenericReturnArgument>
# include <QMessageBox>
# include <QMetaObject>
#endif
@@ -591,7 +590,7 @@ TaskPipeOrientation::TaskPipeOrientation(ViewProviderPipe* PipeView, bool /*newO
// should be called after panel has become visible
QMetaObject::invokeMethod(this, "updateUI", Qt::QueuedConnection,
QGenericReturnArgument(), Q_ARG(int,pipe->Mode.getValue()));
Q_ARG(int,pipe->Mode.getValue()));
this->blockSelection(false);
}
@@ -846,7 +845,7 @@ TaskPipeScaling::TaskPipeScaling(ViewProviderPipe* PipeView, bool /*newObj*/, QW
// should be called after panel has become visible
QMetaObject::invokeMethod(this, "updateUI", Qt::QueuedConnection,
QGenericReturnArgument(), Q_ARG(int,pipe->Transformation.getValue()));
Q_ARG(int,pipe->Transformation.getValue()));
this->blockSelection(false);
}