diff options
Diffstat (limited to '0026-Fix-qt5_wrap_ui-macro.patch')
-rw-r--r-- | 0026-Fix-qt5_wrap_ui-macro.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/0026-Fix-qt5_wrap_ui-macro.patch b/0026-Fix-qt5_wrap_ui-macro.patch new file mode 100644 index 000000000000..2773f0a33081 --- /dev/null +++ b/0026-Fix-qt5_wrap_ui-macro.patch @@ -0,0 +1,28 @@ +From 7e20d462a43054bc5ff6776454277344436df710 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 4 Dec 2016 20:35:47 +0100 +Subject: [PATCH 26/26] Fix qt5_wrap_ui() macro + +See https://github.com/Martchus/PKGBUILDs/issues/11 +--- + src/widgets/Qt5WidgetsMacros.cmake | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake +index f5e7b7f..18d120f 100644 +--- a/src/widgets/Qt5WidgetsMacros.cmake ++++ b/src/widgets/Qt5WidgetsMacros.cmake +@@ -55,8 +55,9 @@ function(QT5_WRAP_UI outfiles ) + get_filename_component(outfile ${it} NAME_WE) + get_filename_component(infile ${it} ABSOLUTE) + set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) ++ get_target_property(UIC_LOC ${Qt5Widgets_UIC_EXECUTABLE} IMPORTED_LOCATION) + add_custom_command(OUTPUT ${outfile} +- COMMAND ${Qt5Widgets_UIC_EXECUTABLE} ++ COMMAND ${UIC_LOC} + ARGS ${ui_options} -o ${outfile} ${infile} + MAIN_DEPENDENCY ${infile} VERBATIM) + list(APPEND ${outfiles} ${outfile}) +-- +2.10.2 + |