File tree Expand file tree Collapse file tree 3 files changed +12
-0
lines changed
3rdparty/interface/process Expand file tree Collapse file tree 3 files changed +12
-0
lines changed Original file line number Diff line number Diff line change @@ -46,9 +46,11 @@ KPtyProcess::KPtyProcess(QObject *parent) :
4646 d->pty ->open ();
4747 connect (this , SIGNAL (stateChanged (QProcess::ProcessState)),
4848 SLOT (_k_onStateChanged (QProcess::ProcessState)));
49+ #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
4950 setChildProcessModifier ([this ](){
5051 setupChildProcessImpl ();
5152 });
53+ #endif
5254}
5355
5456KPtyProcess::KPtyProcess (int ptyMasterFd, QObject *parent) :
@@ -60,9 +62,11 @@ KPtyProcess::KPtyProcess(int ptyMasterFd, QObject *parent) :
6062 d->pty ->open (ptyMasterFd);
6163 connect (this , SIGNAL (stateChanged (QProcess::ProcessState)),
6264 SLOT (_k_onStateChanged (QProcess::ProcessState)));
65+ #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
6366 setChildProcessModifier ([this ](){
6467 setupChildProcessImpl ();
6568 });
69+ #endif
6670}
6771
6872KPtyProcess::~KPtyProcess ()
Original file line number Diff line number Diff line change @@ -95,7 +95,11 @@ void PreviousLabel::mouseDoubleClickEvent(QMouseEvent *event)
9595 QLabel::mouseDoubleClickEvent (event);
9696}
9797
98+ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
99+ void PreviousLabel::enterEvent (QEvent *event)
100+ #else
98101void PreviousLabel::enterEvent (QEnterEvent *event)
102+ #endif
99103{
100104 // qDebug() << "PreviousLabel enter event";
101105 if (!hasFocus ()) {
Original file line number Diff line number Diff line change @@ -46,7 +46,11 @@ class PreviousLabel: public Dtk::Widget::DLabel
4646protected:
4747 void paintEvent (QPaintEvent *e) override ;
4848 void mouseDoubleClickEvent (QMouseEvent *event) override ;
49+ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
50+ void enterEvent (QEvent *event) override ;
51+ #else
4952 void enterEvent (EnterEvent *event) override ;
53+ #endif
5054 void leaveEvent (QEvent *event) override ;
5155 void focusInEvent (QFocusEvent *event) Q_DECL_OVERRIDE;
5256 void focusOutEvent (QFocusEvent *event) Q_DECL_OVERRIDE;
You can’t perform that action at this time.
0 commit comments