diff options
| author | Martchus | 2017-02-09 21:00:00 +0100 |
|---|---|---|
| committer | Martchus | 2017-02-09 21:00:00 +0100 |
| commit | 017bc5699e8507491c2acbe88d0fd51185422c11 (patch) | |
| tree | 13b401ebe2f19ba3c953534dbb1afa4c8f23b2a5 /0024-Fix-qt5_wrap_ui-macro.patch | |
| parent | d5440cf4c6f5db8ea6794b1bdc895ceb9bc55efc (diff) | |
| download | aur-017bc5699e8507491c2acbe88d0fd51185422c11.tar.gz | |
Update to 5.8.0
Diffstat (limited to '0024-Fix-qt5_wrap_ui-macro.patch')
| -rw-r--r-- | 0024-Fix-qt5_wrap_ui-macro.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/0024-Fix-qt5_wrap_ui-macro.patch b/0024-Fix-qt5_wrap_ui-macro.patch new file mode 100644 index 000000000000..5f383e7eb8df --- /dev/null +++ b/0024-Fix-qt5_wrap_ui-macro.patch @@ -0,0 +1,28 @@ +From 40049fa696cc4b02cab01cf3a79f5ea76b92d364 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 4 Dec 2016 20:35:47 +0100 +Subject: [PATCH 24/30] 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 f5e7b7f050..18d120f0c7 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.11.1 + |