Skip to content

Commit c7dcf43

Browse files
committed
update qt patch
1 parent 3c4db7e commit c7dcf43

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

patches/patchQtPlugins

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1+
Submodule opencv contains modified content
12
diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
2-
index 8ccad4d03a..0d5e2a79e9 100644
3+
index 4c0b3880fc..dbe1a74622 100644
34
--- a/opencv/CMakeLists.txt
45
+++ b/opencv/CMakeLists.txt
5-
@@ -1164,6 +1164,7 @@ if(WITH_QT OR HAVE_QT)
6+
@@ -1187,6 +1187,12 @@ if(WITH_QT OR HAVE_QT)
67
if(HAVE_QT5)
78
status(" QT:" "YES (ver ${Qt5Core_VERSION_STRING})")
89
status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt5OpenGL_LIBRARIES} ${Qt5OpenGL_VERSION_STRING})" ELSE NO)
9-
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
10+
+ if(APPLE)
11+
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
12+
+ endif()
13+
+ if(UNIX)
14+
+ install(DIRECTORY ${Qt5_DIR}/../../qt5/plugins DESTINATION lib/qt)
15+
+ endif()
1016
elseif(HAVE_QT)
1117
status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
1218
status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)

0 commit comments

Comments
 (0)