summarylogtreecommitdiffstats
path: root/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
diff options
context:
space:
mode:
authorMartchus2019-09-09 20:28:35 +0200
committerMartchus2019-09-09 20:28:35 +0200
commit1f08bbcc5a5ae0f3af919c2d9a9d3c6f2d780fc6 (patch)
treea7e1c11f71be152c71b5419b3cd974462ef533e4 /0024-Fix-macro-invoking-moc-rcc-and-uic.patch
parentb69d649de83fd8d7d746d62c2e507dc07428dd89 (diff)
downloadaur-mingw-w64-qt5-base-angle.tar.gz
Update to 5.13.1
Diffstat (limited to '0024-Fix-macro-invoking-moc-rcc-and-uic.patch')
-rw-r--r--0024-Fix-macro-invoking-moc-rcc-and-uic.patch6
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 2c7c89c218a..a3f2eb871e5 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 8d11fcd322083c7ed3277df0931319a0f082fe51 Mon Sep 17 00:00:00 2001
+From ce0f25c8d3725c9c65874c46a169a9581d5c2fcc 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
@@ -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 78b99f5bfe..d383b4e4d8 100644
+index 0f006fe1e3..1db4bed272 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.22.0
+2.23.0