From ab8f26607d451c677c042b021a4185924175dfe7 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Wed, 27 Jan 2021 13:59:15 +0100
Subject: [PATCH] Fix qmake & qbs builds

Amends b585f24257.

Change-Id: I4b6781a0c8ab8dec95e934ac1a3b8cae4c991fef
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/coreplugin/coreplugin.qbs      | 11 ++---------
 src/plugins/coreplugin/locator/locator.pri |  7 ++-----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 3936a1739af..3a0d1f0bef7 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -364,21 +364,14 @@ Project {
                 "locatorwidget.h",
                 "opendocumentsfilter.cpp",
                 "opendocumentsfilter.h",
+                "spotlightlocatorfilter.h",
+                "spotlightlocatorfilter.cpp",
                 "urllocatorfilter.cpp",
                 "urllocatorfilter.h",
                 "urllocatorfilter.ui"
             ]
         }
 
-        Group {
-            name: "Locator_mac"
-            condition: qbs.targetOS.contains("macos")
-            files: [
-                "locator/spotlightlocatorfilter.h",
-                "locator/spotlightlocatorfilter.cpp",
-            ]
-        }
-
         Export {
             Depends { name: "Aggregation" }
             Depends { name: "Utils" }
diff --git a/src/plugins/coreplugin/locator/locator.pri b/src/plugins/coreplugin/locator/locator.pri
index 376ba0d261a..5f6b4002c10 100644
--- a/src/plugins/coreplugin/locator/locator.pri
+++ b/src/plugins/coreplugin/locator/locator.pri
@@ -12,6 +12,7 @@ HEADERS += \
     $$PWD/directoryfilter.h \
     $$PWD/locatormanager.h \
     $$PWD/basefilefilter.h \
+    $$PWD/spotlightlocatorfilter.h \
     $$PWD/executefilter.h \
     $$PWD/locatorsearchutils.h \
     $$PWD/locatorsettingspage.h \
@@ -29,6 +30,7 @@ SOURCES += \
     $$PWD/directoryfilter.cpp \
     $$PWD/locatormanager.cpp \
     $$PWD/basefilefilter.cpp \
+    $$PWD/spotlightlocatorfilter.cpp
     $$PWD/ilocatorfilter.cpp \
     $$PWD/executefilter.cpp \
     $$PWD/locatorsearchutils.cpp \
@@ -50,8 +52,3 @@ equals(TEST, 1) {
         $$PWD/locator_test.cpp
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
-
-osx {
-    HEADERS += $$PWD/spotlightlocatorfilter.h
-    SOURCES += $$PWD/spotlightlocatorfilter.cpp
-}