From 9ae5371190e9ba0f7cd5eb3c348c610c22ee6114 Mon Sep 17 00:00:00 2001 From: Neil Date: Wed, 14 Jun 2017 08:54:07 +1000 Subject: Use $$files instead of bare wildcard to support including in a parent project. --- 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 9083eced6..613393011 100644 --- a/qt/ScintillaEdit/ScintillaEdit.pro +++ b/qt/ScintillaEdit/ScintillaEdit.pro @@ -63,7 +63,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 cd87ca0e6..098fa74bd 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -61,7 +61,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 396e037fb..6193c3fb6 100644 --- a/qt/ScintillaEditPy/ScintillaEditPy.pro +++ b/qt/ScintillaEditPy/ScintillaEditPy.pro @@ -97,9 +97,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