Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Network
Konqueror
Commits
a46d9ee8
Commit
a46d9ee8
authored
Sep 17, 2020
by
Laurent Montel
😁
Browse files
Port deprecated enum
parent
4603b92a
Changes
3
Hide whitespace changes
Inline
Side-by-side
plugins/uachanger/uachangerplugin.cpp
View file @
a46d9ee8
...
...
@@ -301,7 +301,11 @@ void UAChangerPlugin::slotDefault()
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
Qt
::
SkipEmptyParts
);
#else
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QString
::
SkipEmptyParts
);
#else
Qt
::
SkipEmptyParts
);
#endif
#endif
if
(
!
partList
.
isEmpty
())
{
partList
.
removeFirst
();
...
...
sidebar/trees/bookmark_module/bookmark_module.cpp
View file @
a46d9ee8
...
...
@@ -555,7 +555,11 @@ KonqSidebarBookmarkItem *KonqSidebarBookmarkModule::findByAddress(const QString
{
Q3ListViewItem
*
item
=
m_topLevelItem
;
// The address is something like /5/10/2
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const
QStringList
addresses
=
address
.
split
(
'/'
,
QString
::
SkipEmptyParts
);
#else
const
QStringList
addresses
=
address
.
split
(
'/'
,
Qt
::
SkipEmptyParts
);
#endif
for
(
QStringList
::
const_iterator
it
=
addresses
.
constBegin
();
it
!=
addresses
.
constEnd
();
++
it
)
{
uint
number
=
(
*
it
).
toUInt
();
item
=
item
->
firstChild
();
...
...
webenginepart/src/webenginepage.cpp
View file @
a46d9ee8
...
...
@@ -187,8 +187,16 @@ static bool domainSchemeMatch(const QUrl& u1, const QUrl& u2)
if
(
u1
.
scheme
()
!=
u2
.
scheme
())
return
false
;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QStringList
u1List
=
u1
.
host
().
split
(
QL1C
(
'.'
),
QString
::
SkipEmptyParts
);
#else
QStringList
u1List
=
u1
.
host
().
split
(
QL1C
(
'.'
),
Qt
::
SkipEmptyParts
);
#endif
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QStringList
u2List
=
u2
.
host
().
split
(
QL1C
(
'.'
),
QString
::
SkipEmptyParts
);
#else
QStringList
u2List
=
u2
.
host
().
split
(
QL1C
(
'.'
),
Qt
::
SkipEmptyParts
);
#endif
if
(
qMin
(
u1List
.
count
(),
u2List
.
count
())
<
2
)
return
false
;
// better safe than sorry...
...
...
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