diff options
| author | Martchus | 2018-06-25 14:47:48 +0200 |
|---|---|---|
| committer | Martchus | 2018-06-25 14:47:48 +0200 |
| commit | f9f34c3d46419a6c24492eb04ba5d2bbadb71052 (patch) | |
| tree | 8ee57f4df9a4f6078683c2d3b1cb9ec4d2378150 /0026-Fix-macro-invoking-moc-rcc-and-uic.patch | |
| parent | 4fb0ff182a8cef4e0e95ab5e759f6be6f1397d0d (diff) | |
| download | aur-f9f34c3d46419a6c24492eb04ba5d2bbadb71052.tar.gz | |
Update to 5.11.1
Diffstat (limited to '0026-Fix-macro-invoking-moc-rcc-and-uic.patch')
| -rw-r--r-- | 0026-Fix-macro-invoking-moc-rcc-and-uic.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/0026-Fix-macro-invoking-moc-rcc-and-uic.patch index 23e7c6f99f3e..46fba5b4d79c 100644 --- a/0026-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/0026-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 9204f18623db15d10cadbd4c659f47550584984a Mon Sep 17 00:00:00 2001 +From 400f992fa24ed2b62be4258d5d26bff3846d95ce Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 26/33] 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 1627de4002..ed0f6555a7 100644 +index 819b48f973..f11a61be6b 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.17.0 +2.18.0 |