Merged the trunk r8911

13 years ago · d2b36d74cd
parent 139cc61001
commit d2b36d74cd
1 changed files with 3 additions and 1 deletions
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@ -3352,7 +3352,9 @@ void GlFuncTab_QT::unmapBuffer(unsigned int target) const

 void GlFuncTab_QT::generateBitmapFont(const std::string& family, int height, int weight, bool italic, bool /*underline*/, int start, int count, int base) const
 {
-    //CV_FUNCNAME( "GlFuncTab_QT::generateBitmapFont" );
+#ifdef Q_WS_WIN
+    CV_FUNCNAME( "GlFuncTab_QT::generateBitmapFont" );
+#endif

    QFont font(QString(family.c_str()), height, weight, italic);