Merge branch 'dev' into bugfix/win_check_ps
This commit is contained in:
commit
c9cd860654
57 changed files with 434 additions and 1379 deletions
|
|
@ -35,6 +35,9 @@ public:
|
|||
static QString certUtilPath();
|
||||
static QString tun2socksPath();
|
||||
|
||||
static void logException(const std::exception &e);
|
||||
static void logException(const std::exception_ptr &eptr = std::current_exception());
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
static bool signalCtrl(DWORD dwProcessId, DWORD dwCtrlEvent);
|
||||
static QString getNextDriverLetter();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue