diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-09-02 09:30:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-02 13:07:35 +0200 |
| commit | 8fc97fdfc76fc62e1faa23f8b768d1ec303329d4 (patch) | |
| tree | 3991bf746691a6c33615718dd05f6e23b9795ec6 /src/widgets/dialogs/qcolordialog.cpp | |
| parent | 585758389c64e556ef4808308dee27e19241581e (diff) | |
Revert Mac event loop changes.
"Make QGuiApplication::exec() run within NSApplicationMain()"
"Make Qt process native and timer events on Cocoa applications"
"Cocoa: Fix QFontDialog, QColorDialog auto-tests"
This reverts commits
1e14762b8d79118540bd09a84dd3e48f4f5e113e
e4b2a0b4bab2a17a65fedafe9bae50af1fe019f6
df7944e7d7dd8b2bbccbd639eff0ab09745d6cc3
Change-Id: I80b65b5ee0297b090f807bd420664233dfc44f7b
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/widgets/dialogs/qcolordialog.cpp')
| -rw-r--r-- | src/widgets/dialogs/qcolordialog.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index c9f03c5a97..5da41aa0a5 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -2166,8 +2166,6 @@ void QColorDialog::keyPressEvent(QKeyEvent *e) } e->accept(); return; - } else if (d->nativeDialogInUse && d->platformColorDialogHelper()->event(e)) { - return; } QDialog::keyPressEvent(e); } |