retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid overriding window flags. Handle close button window flag added in Qt 4.5. 

git-svn-id: http://voip.null.ro/svn/yate@3754 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2010-10-26 10:46:31 +00:00
parent e8f806c950
commit bd86eb9b79
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clients/qt4/qt4client.cpp
View File

@ -395,6 +395,9 @@ static TokenDict s_windowFlags[] = {
{"help", Qt::WindowContextHelpButtonHint},
{"stayontop", Qt::WindowStaysOnTopHint},
{"frameless", Qt::FramelessWindowHint},
#if QT_VERSION >= 0x040500
{"close", Qt::WindowCloseButtonHint},
#endif
{0,0}
};
@ -2289,8 +2292,7 @@ bool QtWindow::eventFilter(QObject* obj, QEvent* event)
// Set window flags from enclosed widget:
// custom window title/border/sysmenu config
ObjList* f = value.split(',',false);
wid->setWindowFlags(Qt::CustomizeWindowHint);
int flags = wid->windowFlags();
int flags = Qt::CustomizeWindowHint | wid->windowFlags();
// Clear settable flags
TokenDict* dict = s_windowFlags;
for (int i = 0; dict[i].token; i++)