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
53158738
Commit
53158738
authored
Sep 12, 2020
by
Stefano Crocco
Committed by
David Faure
Sep 12, 2020
Browse files
Fix other incompatibilities with Qt 5.12 and Qt 5.13
parent
c112e1fa
Changes
3
Hide whitespace changes
Inline
Side-by-side
plugins/searchbar/searchbar.cpp
View file @
53158738
...
...
@@ -71,7 +71,11 @@ SearchBarPlugin::SearchBarPlugin(QObject *parent,
{
m_searchCombo
=
new
SearchBarCombo
(
nullptr
);
m_searchCombo
->
lineEdit
()
->
installEventFilter
(
this
);
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
connect
(
m_searchCombo
,
QOverload
<
int
>::
of
(
&
QComboBox
::
activated
),
this
,
[
this
](
int
n
){
startSearch
(
m_searchCombo
->
itemText
(
n
));});
#else
connect
(
m_searchCombo
,
&
QComboBox
::
textActivated
,
this
,
&
SearchBarPlugin
::
startSearch
);
#endif
connect
(
m_searchCombo
,
&
SearchBarCombo
::
iconClicked
,
this
,
&
SearchBarPlugin
::
showSelectionMenu
);
m_searchCombo
->
setWhatsThis
(
i18n
(
"Search Bar<p>"
"Enter a search term. Click on the icon to change search mode or provider.</p>"
));
...
...
webenginepart/src/webenginepartdownloadmanager.cpp
View file @
53158738
...
...
@@ -148,7 +148,12 @@ void WebEnginePartDownloadManager::openBlob(QWebEngineDownloadItem* it, WebEngin
{
QMimeDatabase
db
;
QMimeType
type
=
db
.
mimeTypeForName
(
it
->
mimeType
());
QString
fileName
=
generateBlobTempFileName
(
it
->
suggestedFileName
(),
type
.
preferredSuffix
());
#ifdef WEBENGINEDOWNLOADITEM_USE_PATH
QString
suggestedName
=
it
->
path
();
#else
QString
suggestedName
=
it
->
suggestedFileName
();
#endif
QString
fileName
=
generateBlobTempFileName
(
suggestedName
,
type
.
preferredSuffix
());
#ifdef WEBENGINEDOWNLOADITEM_USE_PATH
it
->
setPath
(
m_tempDownloadDir
.
filePath
(
fileName
));
#else
...
...
@@ -253,9 +258,14 @@ void WebEngineBlobDownloadJob::startDownloading()
{
if
(
m_downloadItem
)
{
m_startTime
=
QDateTime
::
currentDateTime
();
#ifdef WEBENGINEDOWNLOADITEM_USE_PATH
QString
name
=
QFileInfo
(
m_downloadItem
->
path
()).
filePath
();
#else
QString
name
=
m_downloadItem
->
downloadFileName
();
#endif
emit
description
(
this
,
i18nc
(
"Notification about downloading a file"
,
"Downloading"
),
QPair
<
QString
,
QString
>
(
i18nc
(
"Source of a file being downloaded"
,
"Source"
),
m_downloadItem
->
url
().
toString
()),
QPair
<
QString
,
QString
>
(
i18nc
(
"Destination of a file download"
,
"Destination"
),
m_downloadItem
->
downloadFileName
()
));
QPair
<
QString
,
QString
>
(
i18nc
(
"Destination of a file download"
,
"Destination"
),
name
));
m_downloadItem
->
resume
();
}
}
...
...
webenginepart/src/webenginewalletprivate.cpp
View file @
53158738
...
...
@@ -182,7 +182,7 @@ void WebEngineWallet::WebEngineWalletPrivate::detectFormsInPage(WebEnginePage* p
WebFormList
forms
=
parseFormDetectionResult
(
jsForms
,
url
);
callback
(
forms
);
};
page
->
runJavaScript
(
Q
L1S
(
"findFormsInWindow(%1)"
).
arg
(
findLabels
?
"true"
:
""
),
QWebEngineScript
::
ApplicationWorld
,
realCallBack
);
page
->
runJavaScript
(
Q
StringLiteral
(
"findFormsInWindow(%1)"
).
arg
(
findLabels
?
"true"
:
""
),
QWebEngineScript
::
ApplicationWorld
,
realCallBack
);
}
WebEngineWallet
::
WebFormList
WebEngineWallet
::
WebEngineWalletPrivate
::
formsToFill
(
const
WebFormList
&
allForms
)
const
...
...
Write
Preview
Supports
Markdown
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