AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QMenuBar: Clean up Q_WS_WIN

Browse Source 
- Replace Q_WS_WIN with Q_OS_WIN
 - Remove useless #ifdef Q_OS_WINCE which located in another #ifdef
   Q_OS_WINCE

Change-Id: I6279b6d74902ab3ca6bdb7292c2936a76e3e6952
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Debao Zhang 2012-02-22 18:29:51 -08:00 committed by Qt by Nokia
parent c065ac562a
commit 1501f1ddd4
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/widgets/qmenubar.cpp
View File

@ -1075,7 +1075,7 @@ void QMenuBar::mousePressEvent(QMouseEvent *e)
d->activeMenu = 0;
menu->hide();
}
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
if((d->closePopupMode = style()->styleHint(QStyle::SH_MenuBar_DismissOnSecondClick)))
update(d->actionRect(action));
#endif
@ -1845,15 +1845,12 @@ void QMenuBar::setDefaultAction(QAction *act)
Q_D(QMenuBar);
if (d->defaultAction == act)
return;
#ifdef Q_OS_WINCE
if (qt_wince_is_mobile())
if (d->defaultAction) {
disconnect(d->defaultAction, SIGNAL(changed()), this, SLOT(_q_updateDefaultAction()));
disconnect(d->defaultAction, SIGNAL(destroyed()), this, SLOT(_q_updateDefaultAction()));
}
#endif
d->defaultAction = act;
#ifdef Q_OS_WINCE
if (qt_wince_is_mobile())
if (d->defaultAction) {
connect(d->defaultAction, SIGNAL(changed()), this, SLOT(_q_updateDefaultAction()));
@ -1862,7 +1859,6 @@ void QMenuBar::setDefaultAction(QAction *act)
if (d->wce_menubar) {
d->wce_menubar->rebuild();
}
#endif
}
/*!

4
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
View File

@ -50,10 +50,6 @@
#include <qaction.h>
#include <qstyleoption.h>
#ifdef Q_WS_WIN
#include <windows.h>
#endif
#include <qobject.h>
QT_FORWARD_DECLARE_CLASS(QMainWindow)