diff options
| author | Martchus | 2020-01-29 19:07:45 +0100 |
|---|---|---|
| committer | Martchus | 2020-01-29 19:07:45 +0100 |
| commit | 987f9648ff49b109a9aabdfc52d0835c788f3c5c (patch) | |
| tree | efd536ff3770fa1dad569de18dd5e33f289de168 /0024-Fix-macro-invoking-moc-rcc-and-uic.patch | |
| parent | 36f967d0403c671dbe251d945a98e7f4e37e7176 (diff) | |
| download | aur-987f9648ff49b109a9aabdfc52d0835c788f3c5c.tar.gz | |
Update to 5.14.1
Diffstat (limited to '0024-Fix-macro-invoking-moc-rcc-and-uic.patch')
| -rw-r--r-- | 0024-Fix-macro-invoking-moc-rcc-and-uic.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index dd7f66ccacff..2aafe2b53a9a 100644 --- a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From f2e043c1c3d6e268ac890062068ff4bb3306d2ff Mon Sep 17 00:00:00 2001 +From 27a3b8f6185d125e39267456483abdde1f53ba44 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 24/31] Fix macro invoking moc, rcc and uic @@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 17cc19fc4e..29022697a4 100644 +index 84c75401b1..3a35e30777 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.24.1 +2.25.0 |