diff options
| author | Martchus | 2022-09-10 20:51:38 +0200 |
|---|---|---|
| committer | Martchus | 2022-09-10 20:51:38 +0200 |
| commit | cd20f62b14912f89b2e419cd272b9a56a488e68e (patch) | |
| tree | 2ed788a01fe2041bb1e7d49d0b98c8b9151770dd /0024-Fix-macro-invoking-moc-rcc-and-uic.patch | |
| parent | d2d77744b4717d24ba9d84d3c846074208c67484 (diff) | |
| download | aur-cd20f62b14912f89b2e419cd272b9a56a488e68e.tar.gz | |
Rebase against Qt 5.15.6
Diffstat (limited to '0024-Fix-macro-invoking-moc-rcc-and-uic.patch')
| -rw-r--r-- | 0024-Fix-macro-invoking-moc-rcc-and-uic.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index a13e9945d8e6..e642f3d8383f 100644 --- a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,7 +1,7 @@ -From 44428a18a9d7a548f78b22cdc24945e79ae6fcc2 Mon Sep 17 00:00:00 2001 +From 531447697fcfaecad46f1169e9a2b3a684993a45 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 4 Dec 2016 20:35:47 +0100 -Subject: [PATCH 24/33] Fix macro invoking moc, rcc and uic +Subject: [PATCH 24/32] Fix macro invoking moc, rcc and uic * Otherwise the arguments aren't passed correctly leading to errors like ``` @@ -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 f5766f8775..2403717802 100644 +index d91873f1bc..8f1fb17722 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -153,8 +153,9 @@ function(qt5_create_moc_command infile outfile moc_flags moc_options moc_target @@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.36.1 +2.37.3 |