Update version for new release 6.6.7

focusWindow may have no platform window.


(cherry picked from commit aac600107a)

Co-authored-by: Vlad Zahorodnii <[email protected]>

.gitlab-ci.yml

@@ -5,8 +5,6 @@ include:
   - project: sysadmin/ci-utilities
     file:
       - /gitlab-templates/reuse-lint.yml
-      - /gitlab-templates/linux-qt6.yml
-      - /gitlab-templates/freebsd-qt6.yml
+      - /gitlab-templates/linux-qt6-lts.yml
       - /gitlab-templates/xml-lint.yml
       - /gitlab-templates/yaml-lint.yml
-      - /gitlab-templates/linux-qt6-next.yml

.kde-ci.yml

@@ -4,7 +4,7 @@
 Dependencies:
  - 'on': ['@all']
    'require':
-    'frameworks/extra-cmake-modules': '@latest-kf6'
+    'frameworks/extra-cmake-modules': 'Frameworks/6.24'
     'third-party/wayland': '@latest'
     'third-party/wayland-protocols': '@latest'
 

CMakeLists.txt

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(layershellqt)
-set(PROJECT_VERSION "6.6.1")
+set(PROJECT_VERSION "6.6.7")
 set(PROJECT_VERSION_MAJOR 6)
 
 set(CMAKE_C_STANDARD 99)

src/qwaylandlayersurface.cpp

@@ -204,7 +204,7 @@ bool QWaylandLayerSurface::requestActivate()
         return true;
     } else {
         const auto focusWindow = QGuiApplication::focusWindow();
-        const auto wlWindow = focusWindow ? static_cast<QtWaylandClient::QWaylandWindow *>(focusWindow->handle()) : window();
+        const auto wlWindow = focusWindow && focusWindow->handle() ? static_cast<QtWaylandClient::QWaylandWindow *>(focusWindow->handle()) : window();
         if (const auto seat = wlWindow->display()->lastInputDevice()) {
             const auto tokenProvider = activation->requestXdgActivationToken(wlWindow->display(), wlWindow->wlSurface(), seat->serial(), QString());
             connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this, [this](const QString &token) {