mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-03 09:14:12 +02:00
Merge upstream/master into prefix-button
Only one conflict: the include block of sources/ui/configpage/generalconfigurationpage.cpp, where upstream adds editor/terminalnamecheck.h next to the two includes of the prefix editor. All three are kept. The file list in cmake/qet_compilation_vars.cmake merged itself this time.
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
*/
|
||||
|
||||
#include "renumberelementsdialog.h"
|
||||
#include "../../qet.h"
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QDialogButtonBox>
|
||||
@@ -60,6 +61,8 @@ RenumberElementsDialog::RenumberElementsDialog(const QStringList &scheme_titles,
|
||||
|
||||
connect(m_all_rb, &QRadioButton::toggled, this, &RenumberElementsDialog::updateUi);
|
||||
connect(m_one_rb, &QRadioButton::toggled, this, &RenumberElementsDialog::updateUi);
|
||||
|
||||
QET::trackDialogGeometry(this);
|
||||
}
|
||||
|
||||
QString RenumberElementsDialog::selectedSchemeTitle() const
|
||||
|
||||
Reference in New Issue
Block a user