Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't use deprecated Qt functions

This commit is contained in:
Martchus 2019-07-07 12:14:23 +02:00
parent 35386804a6
commit d9f5959165
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testhelper/syncthingtestinstance.cpp
View File

@ -126,7 +126,7 @@ void SyncthingTestInstance::setInterleavedOutputEnabled(bool interleavedOutputEn
return; return;
} }
m_interleavedOutput = interleavedOutputEnabled; m_interleavedOutput = interleavedOutputEnabled;
m_syncthingProcess.setReadChannelMode(interleavedOutputEnabled ? QProcess::ForwardedChannels : QProcess::SeparateChannels); m_syncthingProcess.setProcessChannelMode(interleavedOutputEnabled ? QProcess::ForwardedChannels : QProcess::SeparateChannels);
} }
/*! /*!

4
testhelper/tests/manualtesting.cpp
View File

@ -19,8 +19,8 @@ int main(int argc, char **argv)
SyncthingTestInstance testInstance; SyncthingTestInstance testInstance;
auto &syncthingProcess(testInstance.syncthingProcess()); auto &syncthingProcess(testInstance.syncthingProcess());
syncthingProcess.setReadChannelMode(QProcess::ForwardedChannels); syncthingProcess.setProcessChannelMode(QProcess::ForwardedChannels);
QObject::connect(&syncthingProcess, static_cast<void (QProcess::*)(int)>(&QProcess::finished), &QCoreApplication::exit); QObject::connect(&syncthingProcess, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), &QCoreApplication::exit);
testInstance.start(); testInstance.start();
const int res = testInstance.application().exec(); const int res = testInstance.application().exec();

2
widgets/webview/webviewdialog.cpp
View File

@ -28,7 +28,7 @@ WebViewDialog::WebViewDialog(QWidget *parent)
#if defined(SYNCTHINGWIDGETS_USE_WEBENGINE) #if defined(SYNCTHINGWIDGETS_USE_WEBENGINE)
m_profile = new QWebEngineProfile(objectName(), this); m_profile = new QWebEngineProfile(objectName(), this);
m_profile->setRequestInterceptor(new WebViewInterceptor(m_connectionSettings, m_profile)); m_profile->setUrlRequestInterceptor(new WebViewInterceptor(m_connectionSettings, m_profile));
m_view->setPage(new WebPage(m_profile, this, m_view)); m_view->setPage(new WebPage(m_profile, this, m_view));
#else #else
m_view->setPage(new WebPage(this, m_view)); m_view->setPage(new WebPage(this, m_view));