REMOVE old QT<= 5.14 code
Ubuntu 22.04 use qt 1.15.3. In the code is still used qt code <5.10. A cleanup was done by removing qT code version used in ubuntu 18.04.
This commit is contained in:
@@ -454,10 +454,6 @@ FileOptionsDialog::FileOptionsDialog( QWidget* parent, Qt::WindowFlags fl )
|
||||
|
||||
setOption(QFileDialog::DontUseNativeDialog);
|
||||
|
||||
// This is an alternative to add the button to the grid layout
|
||||
//QDialogButtonBox* box = this->findChild<QDialogButtonBox*>();
|
||||
//box->addButton(extensionButton, QDialogButtonBox::ActionRole);
|
||||
|
||||
//search for the grid layout and add the new button
|
||||
auto grid = this->findChild<QGridLayout*>();
|
||||
grid->addWidget(extensionButton, 4, 2, Qt::AlignLeft);
|
||||
@@ -571,11 +567,6 @@ void FileOptionsDialog::setOptionsWidget(FileOptionsDialog::ExtensionPosition po
|
||||
setMinimumWidth(extensionWidget->width());
|
||||
}
|
||||
|
||||
// Instead of resizing the dialog we can fix the layout size.
|
||||
// This however, doesn't work nicely when the extension widget
|
||||
// is higher/wider than the dialog.
|
||||
//grid->setSizeConstraint(QLayout::SetFixedSize);
|
||||
|
||||
oldSize = size();
|
||||
w->hide();
|
||||
if (show)
|
||||
@@ -912,11 +903,7 @@ SelectModule::SelectModule (const QString& type, const SelectModule::Dict& types
|
||||
// connections
|
||||
connect(buttonBox, &QDialogButtonBox::accepted, this, &SelectModule::accept);
|
||||
connect(buttonBox, &QDialogButtonBox::rejected, this, &SelectModule::reject);
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
|
||||
connect(group, qOverload<int>(&QButtonGroup::buttonClicked), this, &SelectModule::onButtonClicked);
|
||||
#else
|
||||
connect(group, &QButtonGroup::idClicked, this, &SelectModule::onButtonClicked);
|
||||
#endif
|
||||
}
|
||||
|
||||
SelectModule::~SelectModule() = default;
|
||||
|
||||
Reference in New Issue
Block a user