diff options
| author | Martchus | 2024-03-16 19:42:15 +0100 |
|---|---|---|
| committer | Martchus | 2024-03-16 19:42:15 +0100 |
| commit | 1e3380e1d0b5e1eca05cd2efdb555a7e7f6628ce (patch) | |
| tree | 6339cd620e99d2a9f131f9d3733ef91ef72699a0 /0024-Fix-macro-invoking-moc-rcc-and-uic.patch | |
| parent | 7fc943db03693938c9f5bf647278a2e546ed6e64 (diff) | |
| download | aur-mingw-w64-qt5-base.tar.gz | |
Update to 5.15.13
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 9930cb377c73..ccb734bcded2 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 c78641f7d7f6fc5878153d219e83dbf27d8a07b4 Mon Sep 17 00:00:00 2001 +From bfe19d4efc3d2102f6132231a3d41b4940ba2ecf Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 24/32] 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 d91873f1bc..8f1fb17722 100644 +index d91873f1bc9..8f1fb177225 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 @@ -55,7 +55,7 @@ index d91873f1bc..8f1fb17722 100644 MAIN_DEPENDENCY ${infile} DEPENDS ${_rc_depends} "${_out_depends}" VERBATIM) diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake -index 35d2a2dc54..99f061f1b8 100644 +index 35d2a2dc546..99f061f1b82 100644 --- a/src/widgets/Qt5WidgetsMacros.cmake +++ b/src/widgets/Qt5WidgetsMacros.cmake @@ -55,8 +55,9 @@ function(qt5_wrap_ui outfiles ) @@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.43.0 +2.44.0 |