From f2dad788e782a9e7b5abb8a036370f6d8e29f7fc Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Thu, 25 Jun 2020 11:32:12 -0400 Subject: qt module: rcc supports depfiles now, given a recent enough version of Qt5 Add depfile support to generated targets for Qt >= 5.14. Move warning into the module init itself, to check if the version is too old before issuing. Also tweak the wording itself, to advise upgrading to a suitable version of Qt5 instead of advising to wait for a Qt bug to be fixed. --- mesonbuild/modules/qt5.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'mesonbuild/modules/qt5.py') diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py index 244a217..873c2db 100644 --- a/mesonbuild/modules/qt5.py +++ b/mesonbuild/modules/qt5.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .. import mlog from .qt import QtBaseModule @@ -23,6 +22,4 @@ class Qt5Module(QtBaseModule): def initialize(*args, **kwargs): - mlog.warning('rcc dependencies will not work reliably until this upstream issue is fixed:', - mlog.bold('https://bugreports.qt.io/browse/QTBUG-45460'), fatal=False) return Qt5Module(*args, **kwargs) -- cgit v1.1