Skip to content

Commit 142e666

Browse files
committed
Kf5Kdesignerplugin doesn't need to be patched anymore.
1 parent 95c2071 commit 142e666

File tree

1 file changed

+0
-68
lines changed

1 file changed

+0
-68
lines changed

kf5-kdesignerplugin.rb

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ class Kf5Kdesignerplugin < Formula
1414
depends_on "haraldf/kf5/kf5-kplotting"
1515
depends_on "qt5" => "with-d-bus"
1616

17-
def patches
18-
DATA
19-
end
20-
2117
def install
2218
args = std_cmake_args
2319

@@ -27,67 +23,3 @@ def install
2723
prefix.install "install_manifest.txt"
2824
end
2925
end
30-
31-
__END__
32-
commit 6cbf534c3cd2c5bdda819e092c9778c27e814161
33-
Author: Kurt Hindenburg <[email protected]>
34-
Date: Wed Sep 16 06:15:52 2015 -0700
35-
36-
Qt moc can't handle macros (QT_VERSION_CHECK)
37-
38-
Fix build by removing macro and using hard-coded version. Tested with
39-
Qt 5.4.x
40-
41-
OK per David Faure
42-
43-
diff --git a/src/kgendesignerplugin.cpp b/src/kgendesignerplugin.cpp
44-
index bc4de47..a2c3869 100644
45-
--- a/src/kgendesignerplugin.cpp
46-
+++ b/src/kgendesignerplugin.cpp
47-
@@ -21,7 +21,7 @@ static const char classHeader[] = "/**\n"
48-
"*/\n"
49-
"#include <QIcon>\n"
50-
"#include <QtDesigner/QDesignerContainerExtension>\n"
51-
- "#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)\n"
52-
+ "#if QT_VERSION >= 0x050500\n"
53-
"# include <QtUiPlugin/QDesignerCustomWidgetInterface>\n"
54-
"#else\n"
55-
"# include <QDesignerCustomWidgetInterface>\n"
56-
commit 8669cfd5f9527f0e8584caf93a758e10102690e1
57-
Author: Harald Fernengel <[email protected]>
58-
Date: Fri Sep 25 14:04:24 2015 +0300
59-
60-
Fix build on Mac OS X
61-
62-
Qt 5.5 requires Qt5UiPlugin framework to be in the include path.
63-
On Linux this didn't break as all Qt headers are typically in the
64-
same prefix, but on Mac, the include hierarchy is quite different.
65-
66-
diff --git a/KF5DesignerPluginMacros.cmake b/KF5DesignerPluginMacros.cmake
67-
index 15db23d..0dfa9cd 100644
68-
--- a/KF5DesignerPluginMacros.cmake
69-
+++ b/KF5DesignerPluginMacros.cmake
70-
@@ -87,9 +87,22 @@ macro(kf5designerplugin_add_plugin target)
71-
PURPOSE "Required to build Qt Designer plugins"
72-
)
73-
endif()
74-
+ if(NOT Qt5Designer_VERSION_STRING VERSION_LESS 5.5.0 AND NOT Qt5UiPlugin_FOUND)
75-
+ find_package(Qt5UiPlugin ${REQUIRED_QT_VERSION} ${_requiredarg} NO_MODULE)
76-
+ set_package_properties(Qt5UiPlugin PROPERTIES
77-
+ PURPOSE "Required to build Qt Designer plugins"
78-
+ )
79-
+ endif()
80-
+ if (Qt5UiPlugin_FOUND)
81-
+ # for some reason, Qt5UiPlugin does not set its _INCLUDE_DIRS variable. Fill it manually
82-
+ get_target_property(Qt5UiPlugin_INCLUDE_DIRS Qt5::UiPlugin INTERFACE_INCLUDE_DIRECTORIES)
83-
+ endif()
84-
if(Qt5Designer_FOUND)
85-
add_library(${target} MODULE ${_files})
86-
- target_include_directories(${target} PRIVATE ${Qt5Designer_INCLUDE_DIRS})
87-
+ target_include_directories(${target}
88-
+ PRIVATE ${Qt5UiPlugin_INCLUDE_DIRS}
89-
+ PRIVATE ${Qt5Designer_INCLUDE_DIRS}
90-
+ )
91-
endif()
92-
endmacro()
93-

0 commit comments

Comments
 (0)