summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget_x11.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-18 19:00:36 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-17 10:54:17 (GMT)
commit0f771c62f5253a969f5a8a81bfd9254b9bd58b8f (patch)
tree1f5dcfcfc84fd74f7017710478dadacc18de822c /src/gui/kernel/qwidget_x11.cpp
parentec5b7ea367389234697a98d7243243ec689be724 (diff)
downloadQt-0f771c62f5253a969f5a8a81bfd9254b9bd58b8f.zip
Qt-0f771c62f5253a969f5a8a81bfd9254b9bd58b8f.tar.gz
Qt-0f771c62f5253a969f5a8a81bfd9254b9bd58b8f.tar.bz2
Port QtGui uses of QTime as a stopwatch to QTimestamp
Diffstat (limited to 'src/gui/kernel/qwidget_x11.cpp')
-rw-r--r--src/gui/kernel/qwidget_x11.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 10fb009..3fbb9ce 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -49,7 +49,7 @@
#include "qbitmap.h"
#include "qlayout.h"
#include "qtextcodec.h"
-#include "qdatetime.h"
+#include "qtimestamp.h"
#include "qcursor.h"
#include "qstack.h"
#include "qcolormap.h"
@@ -352,7 +352,7 @@ Q_GUI_EXPORT void qt_x11_wait_for_window_manager(QWidget* w)
return;
QApplication::flush();
XEvent ev;
- QTime t;
+ QTimestamp t;
t.start();
static const int maximumWaitTime = 2000;
if (!w->testAttribute(Qt::WA_WState_Created))