Skip to content

Commit 165d2e2

Browse files
GongHeng2017deepin-bot[bot]
authored andcommitted
Feat: [Adjust_QT5] Add code to adjust QT5
-- Add code to adjust QT5 Log: add feature Task: https://pms.uniontech.com/task-view-383493.html
1 parent 84f57a9 commit 165d2e2

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

3rdparty/interface/process/kptyprocess.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff 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

5456
KPtyProcess::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

6872
KPtyProcess::~KPtyProcess()

src/source/tree/treeheaderview.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff 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
98101
void PreviousLabel::enterEvent(QEnterEvent *event)
102+
#endif
99103
{
100104
// qDebug() << "PreviousLabel enter event";
101105
if(!hasFocus()) {

src/source/tree/treeheaderview.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ class PreviousLabel: public Dtk::Widget::DLabel
4646
protected:
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;

0 commit comments

Comments
 (0)