summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-26 14:02:26 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-17 10:54:19 (GMT)
commit21983be486af0d252b8d393ed36b15becb3c8824 (patch)
tree84501a18ef84aac2f186452741ac93f229090894 /src/gui/text
parente0c97f943e80488c7e674075d40a27822b7e8c78 (diff)
downloadQt-21983be486af0d252b8d393ed36b15becb3c8824.zip
Qt-21983be486af0d252b8d393ed36b15becb3c8824.tar.gz
Qt-21983be486af0d252b8d393ed36b15becb3c8824.tar.bz2
Rename QTimestamp to QElapsedTimer
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfontdatabase_x11.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp
index fd3cba8..b1ab478 100644
--- a/src/gui/text/qfontdatabase_x11.cpp
+++ b/src/gui/text/qfontdatabase_x11.cpp
@@ -43,7 +43,7 @@
#include <qdebug.h>
#include <qpaintdevice.h>
-#include <qtimestamp.h>
+#include <qelapsedtimer.h>
#include <private/qt_x11_p.h>
#include "qx11info_x11.h"
@@ -1218,7 +1218,7 @@ static void load(const QString &family = QString(), int script = -1, bool forceX
}
#ifdef QFONTDATABASE_DEBUG
- QTimestamp t;
+ QElapsedTimer t;
t.start();
#endif
@@ -1301,7 +1301,7 @@ static void initializeDb()
if (!db || db->count)
return;
- QTimestamp t;
+ QElapsedTimer t;
t.start();
#ifndef QT_NO_FONTCONFIG