CI: Remove vs2019, add ninja and use it for packaging.
Fix Screensharing
This commit is contained in:
parent
8cc2b9367c
commit
da7679e6be
2 changed files with 3 additions and 4 deletions
|
|
@ -19,14 +19,12 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "DesktopToolsWindows.hpp"
|
#include "DesktopToolsWindows.hpp"
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QRect>
|
#include <QRect>
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
#include <atlimage.h>
|
|
||||||
#include <dwmapi.h>
|
#include <dwmapi.h>
|
||||||
#include <wingdi.h>
|
|
||||||
#include <winuser.h>
|
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
|
|
||||||
DesktopTools::DesktopTools(QObject *parent) : QObject(parent) {
|
DesktopTools::DesktopTools(QObject *parent) : QObject(parent) {
|
||||||
|
|
@ -97,6 +95,7 @@ QList<QVariantMap> DesktopTools::getWindows() {
|
||||||
|
|
||||||
QImage DesktopTools::getWindowIcon(void *window) {
|
QImage DesktopTools::getWindowIcon(void *window) {
|
||||||
#ifdef ENABLE_SCREENSHARING
|
#ifdef ENABLE_SCREENSHARING
|
||||||
|
HICON icon = (HICON)GetClassLongPtr((HWND)window, GCL_HICON);
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
QPixmap pixmap = QtWin::fromHICON(icon);
|
QPixmap pixmap = QtWin::fromHICON(icon);
|
||||||
return pixmap.toImage();
|
return pixmap.toImage();
|
||||||
|
|
|
||||||
2
external/linphone-sdk
vendored
2
external/linphone-sdk
vendored
|
|
@ -1 +1 @@
|
||||||
Subproject commit 276fe62d3ae49771dd5316a18a0c77d552ed9e80
|
Subproject commit 5cc5fe45f1f255224a0ae416dc19b64a7c43139c
|
||||||
Loading…
Reference in a new issue