Skip to content
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

Jump to bottom

Fix broken activated signal in Qt 6 builds #7274

Merged
merged 1 commit into from
May 21, 2024
Merged

Fix broken activated signal in Qt 6 builds #7274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions src/gui/ProjectNotes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,12 @@ void ProjectNotes::setupActions()
m_comboFont->setEditable( true );
QFontDatabase db;
m_comboFont->addItems( db.families() );
connect( m_comboFont, SIGNAL( activated( const QString& ) ),
m_edit, SLOT( setFontFamily( const QString& ) ) );
#if (QT_VERSION < QT_VERSION_CHECK(5,14,0))
connect(m_comboFont, SIGNAL(activated(const QString&)), m_edit,
#else
connect(m_comboFont, SIGNAL(textActivated(const QString&)), m_edit,
#endif
SLOT(setFontFamily(const QString&)));
m_comboFont->lineEdit()->setText( QApplication::font().family() );

m_comboSize = new QComboBox( tb );
Expand All @@ -158,8 +162,12 @@ void ProjectNotes::setupActions()
{
m_comboSize->addItem( QString::number( *it ) );
}
connect( m_comboSize, SIGNAL( activated( const QString& ) ),
this, SLOT( textSize( const QString& ) ) );
#if (QT_VERSION < QT_VERSION_CHECK(5,14,0))
connect(m_comboSize, SIGNAL(activated(const QString&)), this,
#else
connect(m_comboSize, SIGNAL(textActivated(const QString&)), this,
#endif
SLOT( textSize( const QString& ) ) );
m_comboSize->lineEdit()->setText( QString::number(
QApplication::font().pointSize() ) );

Expand Down
8 changes: 8 additions & 0 deletions src/gui/modals/SetupDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,11 @@ SetupDialog::SetupDialog(ConfigTab tab_to_open) :
setCurrentIndex(m_audioInterfaces->findText(audioDevName));
m_audioIfaceSetupWidgets[audioDevName]->show();

#if (QT_VERSION < QT_VERSION_CHECK(5,14,0))
connect(m_audioInterfaces, SIGNAL(activated(const QString&)),
#else
connect(m_audioInterfaces, SIGNAL(textActivated(const QString&)),
#endif
this, SLOT(audioInterfaceChanged(const QString&)));

// Advanced setting, hidden for now
Expand Down Expand Up @@ -685,7 +689,11 @@ SetupDialog::SetupDialog(ConfigTab tab_to_open) :
m_midiInterfaces->setCurrentIndex(m_midiInterfaces->findText(midiDevName));
m_midiIfaceSetupWidgets[midiDevName]->show();

#if (QT_VERSION < QT_VERSION_CHECK(5,14,0))
connect(m_midiInterfaces, SIGNAL(activated(const QString&)),
#else
connect(m_midiInterfaces, SIGNAL(textActivated(const QString&)),
#endif
this, SLOT(midiInterfaceChanged(const QString&)));


Expand Down
Loading