diff --git a/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt index bab7003bd6d7f5d481e06444a2c27827481d21a4..b1ca5784a452732ff1409dd080f174eb14ebaed9 100644 --- a/src/libclient/CMakeLists.txt +++ b/src/libclient/CMakeLists.txt @@ -149,6 +149,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") endif() if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + # Remove warnings related to `import`. + add_definitions(-Wno-import-preprocessor-directive-pedantic) set(CMAKE_MACOSX_RPATH on) set(CMAKE_SKIP_BUILD_RPATH false) set(CMAKE_BUILD_WITH_INSTALL_RPATH false) diff --git a/src/libclient/callmodel.cpp b/src/libclient/callmodel.cpp index fd032e1238d411afdd60b5ddb7d89fd5b983bdc7..18587c799e4bb3f4d1e503724026dd15fc04ecae 100644 --- a/src/libclient/callmodel.cpp +++ b/src/libclient/callmodel.cpp @@ -987,22 +987,27 @@ CallModel::getDisplay(int idx, int x, int y, int w, int h) QString CallModel::getDisplay(const QString& windowProcessId, const QString& windowId) { +#if defined(__APPLE__) + Q_UNUSED(windowProcessId) + Q_UNUSED(windowId) + return {}; +#else QString sep = libjami::Media::VideoProtocolPrefix::SEPARATOR; QString ret {}; -#if (defined(Q_OS_UNIX) && !defined(__APPLE__)) +#if defined(Q_OS_UNIX) Q_UNUSED(windowId); ret = QString("%1%2:+0,0 window-id:%3") .arg(libjami::Media::VideoProtocolPrefix::DISPLAY) .arg(sep) .arg(windowProcessId); -#endif -#ifdef WIN32 +#elif WIN32 ret = QString("%1%2:+0,0 window-id:hwnd=%3") .arg(libjami::Media::VideoProtocolPrefix::DISPLAY) .arg(sep) .arg(windowProcessId); #endif return ret; +#endif } CallModelPimpl::CallModelPimpl(const CallModel& linked,