mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2026-11-20 17:11:35 -08:00
Merge branch 'master' into develop
Conflicts: src/CMakeLists.txt src/autotype/xcb/AutoTypeXCB.cpp src/browser/BrowserAction.cpp src/browser/BrowserService.cpp src/browser/BrowserService.h src/browser/BrowserSettings.h src/browser/NativeMessagingHost.cpp src/browser/NativeMessagingHost.h src/gui/EditWidgetIcons.cpp src/gui/EditWidgetIcons.h src/gui/MainWindow.cpp src/proxy/NativeMessagingHost.cpp tests/TestOpenSSHKey.cpp
This commit is contained in:
53 files changed
+9771
-1125
No files matched your search
@@ -36,14 +36,17 @@
|
||||
#include <io.h>
|
||||
#endif
|
||||
|
||||
NativeMessagingBase::NativeMessagingBase()
|
||||
NativeMessagingBase::NativeMessagingBase(const bool enabled)
|
||||
{
|
||||
#ifdef Q_OS_WIN
|
||||
Q_UNUSED(enabled);
|
||||
_setmode(_fileno(stdin), _O_BINARY);
|
||||
_setmode(_fileno(stdout), _O_BINARY);
|
||||
#else
|
||||
m_notifier.reset(new QSocketNotifier(fileno(stdin), QSocketNotifier::Read, this));
|
||||
connect(m_notifier.data(), SIGNAL(activated(int)), this, SLOT(newNativeMessage()));
|
||||
if (enabled) {
|
||||
m_notifier.reset(new QSocketNotifier(fileno(stdin), QSocketNotifier::Read, this));
|
||||
connect(m_notifier.data(), SIGNAL(activated(int)), this, SLOT(newNativeMessage()));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user