From d2b36d74cd4d12a83e01f4946979f7585f6a66bf Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 2 Jul 2012 14:21:51 +0000 Subject: [PATCH] Merged the trunk r8911 --- modules/highgui/src/window_QT.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp index b96988e6f3..fe063c9aaa 100755 --- 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);