summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorSami Merilä <sami.merila@nokia.com>2009-05-05 12:15:17 (GMT)
committerSami Merilä <sami.merila@nokia.com>2009-05-05 12:15:17 (GMT)
commit5791fde8526afc49cdbeee080ead9e8a305e3cd5 (patch)
treecda5018b0e0a3fab6f9d4757f80cffdec566b980 /src/gui
parent649b31e1222f551021739f71a5cc468f7df80e1c (diff)
parenta3d08c254820f0d57e72929ddbd2d1b572060fe7 (diff)
downloadQt-5791fde8526afc49cdbeee080ead9e8a305e3cd5.zip
Qt-5791fde8526afc49cdbeee080ead9e8a305e3cd5.tar.gz
Qt-5791fde8526afc49cdbeee080ead9e8a305e3cd5.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/painting/qbackingstore.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index b533409..fbac811a 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -61,11 +61,6 @@
#include <private/qwsmanager_p.h>
#endif
-#ifdef Q_WS_S60
-#include <unistd.h> // For usleep
-#include <qt_s60_p.h>
-#endif
-
QT_BEGIN_NAMESPACE
extern QRegion qt_dirtyRegion(QWidget *);