Merge branch '1.2'

2021-02-04 13:30:35 +00:00
parent a98daead1d daec97ad66
commit 024d56505a
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@@ -22,6 +22,7 @@
  - Installs a version header (kddockwidgets_version.h) that defines a version string and other useful versioning macros (#138)
  - DockWidgetBase::eventFilter() is protected instead of private (regression vs v1.1) (#148)
    It's recommended that you rebuild your application when updating KDDW, as MSVC encodes private/protected in the name mangling.
+  - Fixed WASM build on Windows (#163)

 * v1.2.0 (17 December 2020)
  - Wayland support
--- a/src/KDDockWidgetsConfig.cmake.in
+++ b/src/KDDockWidgetsConfig.cmake.in
@@ -16,7 +16,7 @@ if (@KDDockWidgets_QTQUICK@)
    find_dependency(Qt5Quick REQUIRED)
 endif()

-if (NOT WIN32 AND NOT APPLE)
+if (NOT WIN32 AND NOT APPLE AND NOT EMSCRIPTEN)
    find_dependency(Qt5X11Extras REQUIRED)
 endif()