Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Krusader
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Utilities
Krusader
Commits
a77ceb07
Commit
a77ceb07
authored
Jun 04, 2020
by
Davide Gianforte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace deprecated QComboBox::highlighted
parent
73834e78
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
krusader/Dialogs/packguibase.cpp
krusader/Dialogs/packguibase.cpp
+1
-1
krusader/compat.h
krusader/compat.h
+14
-0
No files found.
krusader/Dialogs/packguibase.cpp
View file @
a77ceb07
...
...
@@ -89,7 +89,7 @@ PackGUIBase::PackGUIBase(QWidget* parent)
typeData
=
new
QComboBox
(
this
);
typeData
->
setSizePolicy
(
QSizePolicy
(
QSizePolicy
::
Minimum
,
QSizePolicy
::
Fixed
));
connect
(
typeData
,
QOverload
<
const
QString
&>::
of
(
&
QComboBox
::
QCOMBOBOX_ACTIVATED
),
this
,
&
PackGUIBase
::
checkConsistency
);
connect
(
typeData
,
QOverload
<
const
QString
&>::
of
(
&
QComboBox
::
highlighted
),
this
,
&
PackGUIBase
::
checkConsistency
);
connect
(
typeData
,
QOverload
<
const
QString
&>::
of
(
&
QComboBox
::
QCOMBOBOX_HIGHLIGHTED
),
this
,
&
PackGUIBase
::
checkConsistency
);
hbox
->
addWidget
(
typeData
);
grid
->
addLayout
(
hbox
,
1
,
0
);
...
...
krusader/compat.h
View file @
a77ceb07
...
...
@@ -42,6 +42,20 @@
#define QCOMBOBOX_ACTIVATED activated
#endif
/**
* QComboBox::highlighted(const QString &text) was made obsoleted in QT 5.15 in
* favor of QComboBox::textHighlighted(const QString &text)
*
* https://doc.qt.io/qt-5.15/qcombobox-obsolete.html#highlighted-1
*
* This can be removed when the qt minimum version required will be >= 5.14
*/
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
#define QCOMBOBOX_HIGHLIGHTED textHighlighted
#else
#define QCOMBOBOX_HIGHLIGHTED highlighted
#endif
/**
* QFontMetrics::width(const QString&, int) was made obsoleted in QT 5.11 in
* favor of QFontMetrics::horizontalAdvance(const QString &, int)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment