Unconditionally include Script locator filter

We require Qt 5.14 now.

Change-Id: I7da06b0071f7998fd723712f97111c5d31bba9b8
Reviewed-by: hjk <hjk@qt.io>

src/plugins/coreplugin/CMakeLists.txt

@@ -102,6 +102,7 @@ add_qtc_plugin(Core
     locator/externaltoolsfilter.cpp locator/externaltoolsfilter.h
     locator/filesystemfilter.cpp locator/filesystemfilter.h locator/filesystemfilter.ui
     locator/ilocatorfilter.cpp locator/ilocatorfilter.h
+    locator/javascriptfilter.cpp locator/javascriptfilter.h
     locator/locator.cpp locator/locator.h
     locator/locatorconstants.h
     locator/locatorfiltersfilter.cpp locator/locatorfiltersfilter.h
@@ -184,14 +185,6 @@ extend_qtc_plugin(Core
   SOURCES progressmanager/progressmanager_x11.cpp
 )
 
-extend_qtc_plugin(Core
-  CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 5.14.0
-  FEATURE_INFO "Script Locator filter"
-  DEFINES WITH_JAVASCRIPTFILTER
-  SOURCES
-    locator/javascriptfilter.cpp locator/javascriptfilter.h
-)
-
 if ((NOT WIN32) AND (NOT APPLE))
   # install logo
   foreach(size 16 24 32 48 64 128 256 512)

src/plugins/coreplugin/coreplugin.qbs

@@ -23,11 +23,6 @@ Project {
 
         Depends { name: "app_version_header" }
 
-        Properties {
-            condition: Utilities.versionCompare(Qt.qml.version, "5.14.0") >= 0
-            cpp.defines: base.concat("WITH_JAVASCRIPTFILTER")
-        }
-
         cpp.dynamicLibraries: {
             if (qbs.targetOS.contains("windows"))
                 return ["ole32", "user32"]
@@ -351,6 +346,8 @@ Project {
                 "filesystemfilter.ui",
                 "ilocatorfilter.cpp",
                 "ilocatorfilter.h",
+                "javascriptfilter.cpp",
+                "javascriptfilter.h",
                 "locatorconstants.h",
                 "locatorfiltersfilter.cpp",
                 "locatorfiltersfilter.h",
@@ -373,16 +370,6 @@ Project {
             ]
         }
 
-        Group {
-            name: "Locator Javascript Filter"
-            condition: Utilities.versionCompare(Qt.qml.version, "5.14.0") >= 0
-            prefix: "locator/"
-            files: [
-                "javascriptfilter.cpp",
-                "javascriptfilter.h",
-            ]
-        }
-
         Group {
             name: "Locator_mac"
             condition: qbs.targetOS.contains("macos")

src/plugins/coreplugin/locator/locator.cpp

@@ -81,9 +81,7 @@ public:
     LocatorManager m_locatorManager;
     LocatorSettingsPage m_locatorSettingsPage;
 
-#ifdef WITH_JAVASCRIPTFILTER
     JavaScriptFilter m_javaScriptFilter;
-#endif
     OpenDocumentsFilter m_openDocumentsFilter;
     FileSystemFilter m_fileSystemFilter;
     ExecuteFilter m_executeFilter;

src/plugins/coreplugin/locator/locator.pri

@@ -16,7 +16,8 @@ HEADERS += \
     $$PWD/locatorsearchutils.h \
     $$PWD/locatorsettingspage.h \
     $$PWD/urllocatorfilter.h \
-    $$PWD/externaltoolsfilter.h
+    $$PWD/externaltoolsfilter.h \
+    $$PWD/javascriptfilter.h
 
 SOURCES += \
     $$PWD/locator.cpp \
@@ -33,22 +34,11 @@ SOURCES += \
     $$PWD/locatorsearchutils.cpp \
     $$PWD/locatorsettingspage.cpp \
     $$PWD/urllocatorfilter.cpp \
-    $$PWD/externaltoolsfilter.cpp
-
-FORMS += \
-    $$PWD/urllocatorfilter.ui
-
-minQtVersion(5, 14, 0) {
-    DEFINES += WITH_JAVASCRIPTFILTER
-
-    HEADERS += \
-        $$PWD/javascriptfilter.h
-
-    SOURCES += \
+    $$PWD/externaltoolsfilter.cpp \
     $$PWD/javascriptfilter.cpp
-}
 
 FORMS += \
+    $$PWD/urllocatorfilter.ui \
     $$PWD/filesystemfilter.ui \
     $$PWD/directoryfilter.ui \
     $$PWD/locatorsettingspage.ui