diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 12:45:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 12:45:06 (GMT) |
| commit | b1c9df1e46f38e9bedef95647721c77a2bb69386 (patch) | |
| tree | 931f4cba3af8ec86d4e1315987797c1fd6b6f876 /src/gui/kernel/qx11embed_x11.cpp | |
| parent | 78b2e9421c47371b68f4c65a181a077ba3a226ac (diff) | |
| parent | 78e4d861b6aa9e1b9ea71f2c4cabbeb6555a2ee0 (diff) | |
| download | Qt-b1c9df1e46f38e9bedef95647721c77a2bb69386.zip Qt-b1c9df1e46f38e9bedef95647721c77a2bb69386.tar.gz Qt-b1c9df1e46f38e9bedef95647721c77a2bb69386.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: (63 commits)
Revert "Don't emit open signal on session close/error."
Rename networkAccess property to networkAccessible.
Don't emit open signal on session close/error.
Rename private signal.
Autotest: fix instability by accepting rounding errors
Dont force height for filter widget
- Fix importdir option on unix/linux configure
Remove incorrect semi-colons after Q_PROPERTY
10n: Update German translation for 4.7.0
Redesigned filter widgets
Add a test case for commit 76d767080a6be7b025f36d6778dfaedbd31a9f07
Add Japanese/Korean keyboard specific keys to QKeySequence
Fixed qmdiarea autotest regression on Cocoa
Fix JSC export macros
Minor update for f3f979cbd37f47892cd0c0a9fc23b802ed6f7890
Incorrect translation for Application menu items in Mac.
doc: Fixed use of Qt 3 support function in QIcon doc snippet
Build and run QElapsedTimer test.
Fix license headers.
Add flag to indicate that network sessions are expected on a platform.
...
Diffstat (limited to 'src/gui/kernel/qx11embed_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qx11embed_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp index 35850db..b527e72 100644 --- a/src/gui/kernel/qx11embed_x11.cpp +++ b/src/gui/kernel/qx11embed_x11.cpp @@ -47,7 +47,7 @@ #include <qlayout.h> #include <qstyle.h> #include <qstyleoption.h> -#include <qdatetime.h> +#include <qelapsedtimer.h> #include <qpointer.h> #include <qdebug.h> #include <qx11info_x11.h> @@ -1231,7 +1231,7 @@ void QX11EmbedContainer::embedClient(WId id) For safety, we will not wait more than 500 ms, so that we can preemptively workaround buggy window managers. */ - QTime t; + QElapsedTimer t; t.start(); functorData data; |