summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qdnd_s60.cpp
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-01-05 15:07:30 (GMT)
committeraxis <qt-info@nokia.com>2010-01-05 15:07:30 (GMT)
commit0d92fc13baac9d354a7d3a2665ca3bb4127bd606 (patch)
tree04308596166ab753de6de705fcd80b091e4562ad /src/gui/kernel/qdnd_s60.cpp
parent6abee18b8ab9899b909a15227fba8fbc4506fad8 (diff)
parent78474a65e4f61e9d1ae8116d5b690cf78729aa71 (diff)
downloadQt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.zip
Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.tar.gz
Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.tar.bz2
Merge branch 'merge-request-1601' into master-s60
Conflicts: bin/createpackage.pl mkspecs/features/symbian/application_icon.prf qmake/generators/symbian/symmake_abld.cpp src/gui/text/qfontdatabase_s60.cpp src/s60main/s60main.pro
Diffstat (limited to 'src/gui/kernel/qdnd_s60.cpp')
-rw-r--r--src/gui/kernel/qdnd_s60.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qdnd_s60.cpp b/src/gui/kernel/qdnd_s60.cpp
index 65deb5d..319c844 100644
--- a/src/gui/kernel/qdnd_s60.cpp
+++ b/src/gui/kernel/qdnd_s60.cpp
@@ -52,7 +52,7 @@
#include "qdnd_p.h"
#include "qt_s60_p.h"
-#include <COECNTRL.H>
+#include <coecntrl.h>
// pointer cursor
#include <w32std.h>
#include <gdi.h>