Bump minimum Qt version to 5.15 (#8129)
This commit is contained in:
@@ -846,17 +846,6 @@ CarlaParamsView::CarlaParamsView(CarlaInstrumentView* const instrumentView, QWid
|
||||
splitter->addWidget(outputFrame);
|
||||
verticalLayout->addWidget(splitter);
|
||||
|
||||
#if QT_VERSION < 0x50C00
|
||||
// Workaround for a bug in Qt versions below 5.12,
|
||||
// where argument-dependent-lookup fails for QFlags operators
|
||||
// declared inside a namespace.
|
||||
// This affects the Q_DECLARE_OPERATORS_FOR_FLAGS macro in Instrument.h
|
||||
// See also: https://codereview.qt-project.org/c/qt/qtbase/+/225348
|
||||
|
||||
using ::operator|;
|
||||
|
||||
#endif
|
||||
|
||||
// -- Sub window
|
||||
auto win = new CarlaParamsSubWindow(getGUI()->mainWindow()->workspace()->viewport(),
|
||||
Qt::SubWindow | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint);
|
||||
@@ -1051,17 +1040,6 @@ void CarlaParamsView::windowResized()
|
||||
|
||||
void CarlaParamsView::addKnob(uint32_t index)
|
||||
{
|
||||
#if QT_VERSION < 0x50C00
|
||||
// Workaround for a bug in Qt versions below 5.12,
|
||||
// where argument-dependent-lookup fails for QFlags operators
|
||||
// declared inside a namespace.
|
||||
// This affects the Q_DECLARE_OPERATORS_FOR_FLAGS macro in Instrument.h
|
||||
// See also: https://codereview.qt-project.org/c/qt/qtbase/+/225348
|
||||
|
||||
using ::operator|;
|
||||
|
||||
#endif
|
||||
|
||||
bool output = m_carlaInstrument->m_paramModels[index]->isOutput();
|
||||
if (output)
|
||||
{
|
||||
|
||||
@@ -139,10 +139,6 @@ QString GranularPitchShifterHelpView::s_helpText=
|
||||
|
||||
GranularPitchShifterHelpView::GranularPitchShifterHelpView():QTextEdit(s_helpText)
|
||||
{
|
||||
#if (QT_VERSION < QT_VERSION_CHECK(5,12,0))
|
||||
// Bug workaround: https://codereview.qt-project.org/c/qt/qtbase/+/225348
|
||||
using ::operator|;
|
||||
#endif
|
||||
setWindowTitle("Granular Pitch Shifter Help");
|
||||
setTextInteractionFlags(Qt::TextSelectableByKeyboard | Qt::TextSelectableByMouse);
|
||||
getGUI()->mainWindow()->addWindowedWidget(this);
|
||||
|
||||
@@ -441,11 +441,8 @@ QString Lb302Synth::nodeName() const
|
||||
// OBSOLETE. Break apart once we get Q_OBJECT to work. >:[
|
||||
void Lb302Synth::recalcFilter()
|
||||
{
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
|
||||
vcf.loadRelaxed()->recalc();
|
||||
#else
|
||||
vcf.load()->recalc();
|
||||
#endif
|
||||
|
||||
// THIS IS OLD 3pole/24dB code, I may reintegrate it. Don't need it
|
||||
// right now. Should be toggled by LB_24_RES_TRICK at the moment.
|
||||
|
||||
@@ -700,11 +697,8 @@ void Lb302Synth::initNote( Lb302Note *n)
|
||||
|
||||
if(n->dead ==0){
|
||||
// Swap next two blocks??
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
|
||||
vcf.loadRelaxed()->playNote();
|
||||
#else
|
||||
vcf.load()->playNote();
|
||||
#endif
|
||||
|
||||
// Ensure envelope is recalculated
|
||||
vcf_envpos = ENVINC;
|
||||
|
||||
|
||||
@@ -474,10 +474,6 @@ QString SlewDistortionHelpView::s_helpText = tr(
|
||||
|
||||
SlewDistortionHelpView::SlewDistortionHelpView() : QTextEdit(s_helpText)
|
||||
{
|
||||
#if (QT_VERSION < QT_VERSION_CHECK(5,12,0))
|
||||
// Bug workaround: https://codereview.qt-project.org/c/qt/qtbase/+/225348
|
||||
using ::operator|;
|
||||
#endif
|
||||
setWindowTitle("Slew Distortion Help");
|
||||
setTextInteractionFlags(Qt::TextSelectableByKeyboard | Qt::TextSelectableByMouse);
|
||||
getGUI()->mainWindow()->addWindowedWidget(this);
|
||||
|
||||
@@ -922,17 +922,6 @@ ManageVestigeInstrumentView::ManageVestigeInstrumentView( Instrument * _instrume
|
||||
QWidget * _parent, VestigeInstrument * m_vi2 ) :
|
||||
InstrumentViewFixedSize( _instrument, _parent )
|
||||
{
|
||||
#if QT_VERSION < 0x50C00
|
||||
// Workaround for a bug in Qt versions below 5.12,
|
||||
// where argument-dependent-lookup fails for QFlags operators
|
||||
// declared inside a namespace.
|
||||
// This affects the Q_DECLARE_OPERATORS_FOR_FLAGS macro in Instrument.h
|
||||
// See also: https://codereview.qt-project.org/c/qt/qtbase/+/225348
|
||||
|
||||
using ::operator|;
|
||||
|
||||
#endif
|
||||
|
||||
m_vi = m_vi2;
|
||||
m_vi->m_scrollArea = new QScrollArea( this );
|
||||
widget = new QWidget(this);
|
||||
|
||||
@@ -48,16 +48,6 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) :
|
||||
m_plugin( nullptr ),
|
||||
tbLabel( nullptr )
|
||||
{
|
||||
#if QT_VERSION < 0x50C00
|
||||
// Workaround for a bug in Qt versions below 5.12,
|
||||
// where argument-dependent-lookup fails for QFlags operators
|
||||
// declared inside a namespace.
|
||||
// This affects the Q_DECLARE_OPERATORS_FOR_FLAGS macro in Instrument.h
|
||||
// See also: https://codereview.qt-project.org/c/qt/qtbase/+/225348
|
||||
|
||||
using ::operator|;
|
||||
#endif
|
||||
|
||||
auto l = new QGridLayout(this);
|
||||
l->setContentsMargins( 10, 10, 10, 10 );
|
||||
l->setVerticalSpacing( 2 );
|
||||
|
||||
@@ -315,19 +315,9 @@ namespace gui
|
||||
ManageVSTEffectView::ManageVSTEffectView( VstEffect * _eff, VstEffectControls * m_vi ) :
|
||||
m_effect( _eff )
|
||||
{
|
||||
#if QT_VERSION < 0x50C00
|
||||
// Workaround for a bug in Qt versions below 5.12,
|
||||
// where argument-dependent-lookup fails for QFlags operators
|
||||
// declared inside a namespace.
|
||||
// This affects the Q_DECLARE_OPERATORS_FOR_FLAGS macro in Instrument.h
|
||||
// See also: https://codereview.qt-project.org/c/qt/qtbase/+/225348
|
||||
|
||||
using ::operator|;
|
||||
#endif
|
||||
|
||||
m_vi2 = m_vi;
|
||||
widget = new QWidget();
|
||||
m_vi->m_scrollArea = new QScrollArea( widget );
|
||||
m_vi->m_scrollArea = new QScrollArea(widget);
|
||||
l = new QGridLayout( widget );
|
||||
|
||||
m_vi->m_subWindow = getGUI()->mainWindow()->addWindowedWidget(nullptr, Qt::SubWindow |
|
||||
|
||||
@@ -861,18 +861,6 @@ QString XpressiveHelpView::s_helpText=
|
||||
|
||||
XpressiveHelpView::XpressiveHelpView():QTextEdit(s_helpText)
|
||||
{
|
||||
|
||||
#if QT_VERSION < 0x50C00
|
||||
// Workaround for a bug in Qt versions below 5.12,
|
||||
// where argument-dependent-lookup fails for QFlags operators
|
||||
// declared inside a namespace.
|
||||
// This affects the Q_DECLARE_OPERATORS_FOR_FLAGS macro in Instrument.h
|
||||
// See also: https://codereview.qt-project.org/c/qt/qtbase/+/225348
|
||||
|
||||
using ::operator|;
|
||||
|
||||
#endif
|
||||
|
||||
setWindowTitle ( "Xpressive Help" );
|
||||
setTextInteractionFlags ( Qt::TextSelectableByKeyboard | Qt::TextSelectableByMouse );
|
||||
getGUI()->mainWindow()->addWindowedWidget( this );
|
||||
|
||||
Reference in New Issue
Block a user