update qt patch

skvark · skvark · commit c7dcf432f474 · 2020-05-22T17:54:01.000+03:00
diff --git a/patches/patchQtPlugins b/patches/patchQtPlugins
@@ -1,12 +1,18 @@
+Submodule opencv contains modified content
 diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
-index 8ccad4d03a..0d5e2a79e9 100644
+index 4c0b3880fc..dbe1a74622 100644
 --- a/opencv/CMakeLists.txt
 +++ b/opencv/CMakeLists.txt
-@@ -1164,6 +1164,7 @@ if(WITH_QT OR HAVE_QT)
+@@ -1187,6 +1187,12 @@ if(WITH_QT OR HAVE_QT)
    if(HAVE_QT5)
      status("    QT:" "YES (ver ${Qt5Core_VERSION_STRING})")
      status("      QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt5OpenGL_LIBRARIES} ${Qt5OpenGL_VERSION_STRING})" ELSE NO)
-+    install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
++    if(APPLE)
++      install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
++    endif()
++    if(UNIX)
++      install(DIRECTORY ${Qt5_DIR}/../../qt5/plugins DESTINATION lib/qt)
++    endif()
    elseif(HAVE_QT)
      status("    QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
      status("      QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
