From bb093407c1399d7f0df8765935f4f259ebb32595 Mon Sep 17 00:00:00 2001 From: Neil Date: Wed, 14 Jun 2017 08:54:07 +1000 Subject: Backport: Use $$files instead of bare wildcard to support including in a parent project. Backport of changeset 6315:9db390056b66. --- qt/ScintillaEdit/ScintillaEdit.pro | 2 +- qt/ScintillaEditBase/ScintillaEditBase.pro | 2 +- qt/ScintillaEditPy/ScintillaEditPy.pro | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro index 2c2ad7303..813126295 100644 --- a/qt/ScintillaEdit/ScintillaEdit.pro +++ b/qt/ScintillaEdit/ScintillaEdit.pro @@ -67,7 +67,7 @@ SOURCES += \ ../../lexlib/CharacterSet.cxx \ ../../lexlib/CharacterCategory.cxx \ ../../lexlib/Accessor.cxx \ - ../../lexers/*.cxx + $$files(../../lexers/*.cxx, false) HEADERS += \ ScintillaEdit.h \ diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index 3ca5a816a..ec9b5b477 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -64,7 +64,7 @@ SOURCES += \ ../../lexlib/CharacterSet.cxx \ ../../lexlib/Accessor.cxx \ ../../lexlib/CharacterCategory.cxx \ - ../../lexers/*.cxx + $$files(../../lexers/*.cxx, false) HEADERS += \ PlatQt.h \ diff --git a/qt/ScintillaEditPy/ScintillaEditPy.pro b/qt/ScintillaEditPy/ScintillaEditPy.pro index 270a64b55..e7457da60 100644 --- a/qt/ScintillaEditPy/ScintillaEditPy.pro +++ b/qt/ScintillaEditPy/ScintillaEditPy.pro @@ -104,9 +104,10 @@ SOURCES += \ ../ScintillaEditBase/PlatQt.cpp \ ../ScintillaEditBase/ScintillaQt.cpp \ ../ScintillaEditBase/ScintillaEditBase.cpp \ - ../../src/*.cxx \ - ../../lexlib/*.cxx \ - ../../lexers/*.cxx + $$files(../../src/*.cxx, false) \ + $$files(../../lexlib/*.cxx, false) \ + $$files(../../lexers/*.cxx, false) + # HEADERS is used to find what needs to be run through moc HEADERS += \ -- cgit v1.2.3