diff options
| author | Dean Dettman <dean.dettman@nokia.com> | 2009-11-24 13:31:20 (GMT) |
|---|---|---|
| committer | Dean Dettman <dean.dettman@nokia.com> | 2009-11-24 13:31:20 (GMT) |
| commit | a9ea797a495dfeef83a577f233849a6fb523f585 (patch) | |
| tree | 66848d1d81a174106cd1fb3a11519969c0c2721b /src/gui | |
| parent | d79d756d057f20ecc1a6e70a00fe792c2a1f95c8 (diff) | |
| parent | 25fd8e7a48f4cc2bd3a5d52ac8f90a6691d65c05 (diff) | |
| download | Qt-a9ea797a495dfeef83a577f233849a6fb523f585.zip Qt-a9ea797a495dfeef83a577f233849a6fb523f585.tar.gz Qt-a9ea797a495dfeef83a577f233849a6fb523f585.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qapplication_mac.mm | 2 | ||||
| -rw-r--r-- | src/gui/styles/qgtkstyle.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm index 84da56e..22a0959 100644 --- a/src/gui/kernel/qapplication_mac.mm +++ b/src/gui/kernel/qapplication_mac.mm @@ -2449,7 +2449,7 @@ OSStatus QApplicationPrivate::globalAppleEventProcessor(const AppleEvent *ae, Ap switch(aeID) { case kAEQuitApplication: { extern bool qt_mac_quit_menu_item_enabled; // qmenu_mac.cpp - if(!QApplicationPrivate::modalState() && qt_mac_quit_menu_item_enabled) { + if (qt_mac_quit_menu_item_enabled) { QCloseEvent ev; QApplication::sendSpontaneousEvent(app, &ev); if(ev.isAccepted()) { diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index 5566cc6..b32c55b 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -1368,7 +1368,7 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom else { gtkCachedPainter.paintFlatBox(gtkEntry, "entry_bg", contentRect, option->state & State_Enabled ? GTK_STATE_NORMAL : GTK_STATE_INSENSITIVE, - GTK_SHADOW_NONE, style, entryPath + QString::number(focus)); + GTK_SHADOW_NONE, gtkCombo->style, entryPath + QString::number(focus)); } gtkCachedPainter.paintShadow(gtkEntry, comboBox->editable ? "entry" : "frame", frameRect, frameState, |