feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix qmake & qbs builds

Browse Source 
Amends b585f24257.

Change-Id: I4b6781a0c8ab8dec95e934ac1a3b8cae4c991fef
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-01-27 13:59:15 +01:00
parent b585f24257
commit ab8f26607d
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/coreplugin.qbs
View File

@@ -364,21 +364,14 @@ Project {
"locatorwidget.h", "locatorwidget.h",
"opendocumentsfilter.cpp", "opendocumentsfilter.cpp",
"opendocumentsfilter.h", "opendocumentsfilter.h",
"spotlightlocatorfilter.h",
"spotlightlocatorfilter.cpp",
"urllocatorfilter.cpp", "urllocatorfilter.cpp",
"urllocatorfilter.h", "urllocatorfilter.h",
"urllocatorfilter.ui" "urllocatorfilter.ui"
] ]
} }
Group {
name: "Locator_mac"
condition: qbs.targetOS.contains("macos")
files: [
"locator/spotlightlocatorfilter.h",
"locator/spotlightlocatorfilter.cpp",
]
}
Export { Export {
Depends { name: "Aggregation" } Depends { name: "Aggregation" }
Depends { name: "Utils" } Depends { name: "Utils" }

7
src/plugins/coreplugin/locator/locator.pri
View File

@@ -12,6 +12,7 @@ HEADERS += \
$$PWD/directoryfilter.h \ $$PWD/directoryfilter.h \
$$PWD/locatormanager.h \ $$PWD/locatormanager.h \
$$PWD/basefilefilter.h \ $$PWD/basefilefilter.h \
$$PWD/spotlightlocatorfilter.h \
$$PWD/executefilter.h \ $$PWD/executefilter.h \
$$PWD/locatorsearchutils.h \ $$PWD/locatorsearchutils.h \
$$PWD/locatorsettingspage.h \ $$PWD/locatorsettingspage.h \
@@ -29,6 +30,7 @@ SOURCES += \
$$PWD/directoryfilter.cpp \ $$PWD/directoryfilter.cpp \
$$PWD/locatormanager.cpp \ $$PWD/locatormanager.cpp \
$$PWD/basefilefilter.cpp \ $$PWD/basefilefilter.cpp \
$$PWD/spotlightlocatorfilter.cpp
$$PWD/ilocatorfilter.cpp \ $$PWD/ilocatorfilter.cpp \
$$PWD/executefilter.cpp \ $$PWD/executefilter.cpp \
$$PWD/locatorsearchutils.cpp \ $$PWD/locatorsearchutils.cpp \
@@ -50,8 +52,3 @@ equals(TEST, 1) {
$$PWD/locator_test.cpp $$PWD/locator_test.cpp
DEFINES += SRCDIR=\\\"$$PWD\\\" DEFINES += SRCDIR=\\\"$$PWD\\\"
} }
osx {
HEADERS += $$PWD/spotlightlocatorfilter.h
SOURCES += $$PWD/spotlightlocatorfilter.cpp
}