diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 16:28:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 16:28:31 (GMT) |
| commit | 7b3880475d02bd3db630387bccccc7e1ef9d4e9a (patch) | |
| tree | ed35f6c268382b7f0fe16321147c914f3b1b5092 /src/corelib | |
| parent | a868f4c9761597abc764c3578b0fffad1fb8177a (diff) | |
| parent | 4b618e48c909fcc5665e9d60645023c48b2ffb43 (diff) | |
| download | Qt-7b3880475d02bd3db630387bccccc7e1ef9d4e9a.zip Qt-7b3880475d02bd3db630387bccccc7e1ef9d4e9a.tar.gz Qt-7b3880475d02bd3db630387bccccc7e1ef9d4e9a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
ShortcutOverride has no effect on some shortcuts on Mac OS X (Cocoa).
Fix restore of maximized window geometry on Windows
Remove qDebug.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentrunbase.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/concurrent/qtconcurrentrunbase.h b/src/corelib/concurrent/qtconcurrentrunbase.h index a7a5cc4..888d395 100644 --- a/src/corelib/concurrent/qtconcurrentrunbase.h +++ b/src/corelib/concurrent/qtconcurrentrunbase.h @@ -106,7 +106,6 @@ public: this->runFunctor(); #ifndef QT_NO_EXCEPTIONS } catch (QtConcurrent::Exception &e) { - qDebug() << "cought exception"; QFutureInterface<T>::reportException(e); } catch (...) { QFutureInterface<T>::reportException(QtConcurrent::UnhandledException()); |