Merge pull request #515 from isdamir:master

9 years ago · b6a97e3e9e
parent e8c6b2a7ad cd7b3ae41e
commit b6a97e3e9e
1 changed files with 2 additions and 1 deletions
--- a/modules/face/include/opencv2/face/predict_collector.hpp
+++ b/modules/face/include/opencv2/face/predict_collector.hpp
@ -47,6 +47,7 @@ the use of this software, even if advised of the possibility of such damage.
 #include <cfloat>
 #include "opencv2/core/cvdef.h"
 #include "opencv2/core/cvstd.hpp"
+#undef emit  //fix for qt
 namespace cv {
 namespace face {
 //! @addtogroup face
@ -99,4 +100,4 @@ public:
 //! @}
 }
 }
-#endif
+#endif