diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-22 18:38:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-22 18:38:54 (GMT) |
| commit | 7857d88a0163d12aca51c017d3fe1878fc3b89ae (patch) | |
| tree | 8ce1955e31b37579aa6df2803a2f2ddd5581e735 /src/gui/dialogs/qprogressdialog.cpp | |
| parent | 58e9855afce71448c709469270950e5add87d601 (diff) | |
| parent | 397a2680b4e7ce90a8e4f8a4617450adb5d5a37d (diff) | |
| download | Qt-7857d88a0163d12aca51c017d3fe1878fc3b89ae.zip Qt-7857d88a0163d12aca51c017d3fe1878fc3b89ae.tar.gz Qt-7857d88a0163d12aca51c017d3fe1878fc3b89ae.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (92 commits)
Make QStackTextEngine cheaper to construct
Add a function to get the transitions available from a state
Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets (part 2).
Code cleaning for the QStringList's joinEmptiness() test case
Fix behavior change QStringList::join() for null
Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets.
Cocoa: fix eventdispatcher crash, found by macgui autotest
Make QWidget::activateWindow() NET window manager aware.
Upgraded QLocale data to Unicode CLDR 1.8.0
Improved CLDR parser.
Fixed reading draft data from CLDR.
Improved the cldr parser for QLocale.
Do not use FSEvents-based filesystemwatcher backend on Mac.
add file missing in commit 74f5e34979b8a08a91aa3c2fa6d252e68eca7817
Moc: Add support for rvalue references in signals and slots.
Add support for polyphonic greek
Fix build failure on WinCE.
Autotests: if you use X11 libs, you must link to X11 libs explicitly.
Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
Compile Phonon in C++0x mode.
...
Diffstat (limited to 'src/gui/dialogs/qprogressdialog.cpp')
| -rw-r--r-- | src/gui/dialogs/qprogressdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/dialogs/qprogressdialog.cpp b/src/gui/dialogs/qprogressdialog.cpp index 4fffdba..a2d7b23 100644 --- a/src/gui/dialogs/qprogressdialog.cpp +++ b/src/gui/dialogs/qprogressdialog.cpp @@ -46,7 +46,6 @@ #include "qshortcut.h" #include "qpainter.h" #include "qdrawutil.h" -#include "qdatetime.h" #include "qlabel.h" #include "qprogressbar.h" #include "qapplication.h" @@ -54,6 +53,7 @@ #include "qpushbutton.h" #include "qcursor.h" #include "qtimer.h" +#include "qelapsedtimer.h" #include <private/qdialog_p.h> #include <limits.h> @@ -103,7 +103,7 @@ public: QTimer *forceTimer; bool shown_once; bool cancellation_flag; - QTime starttime; + QElapsedTimer starttime; #ifndef QT_NO_CURSOR QCursor parentCursor; #endif |