summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2009-12-26 00:28:19 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2009-12-26 00:28:19 (GMT)
commit444fb94e02308bedc7b37a702adb95b740168a94 (patch)
treee4c2d2c92922114cde811776a84b70de65e191f8 /src/gui
parenta1c15ddb82e07dae2e1ed4ae971586379cbf6649 (diff)
parent63bd10ae61ed0b877344b217e57eb87f77256e98 (diff)
downloadQt-444fb94e02308bedc7b37a702adb95b740168a94.zip
Qt-444fb94e02308bedc7b37a702adb95b740168a94.tar.gz
Qt-444fb94e02308bedc7b37a702adb95b740168a94.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Don't include dlfcn.h unconditionally. Fix warning on 64-bit build with MSVC. Add missing license headers to the new solaris-cc-stlport mkspecs. FTBFS on hurd-i386 because since clock_gettime is not available there Fix build on ARMv6 when NEON is detected. Add two new mkspecs for SunCC with stlport.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/embedded/qscreen_qws.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp
index ae5570f..07bb258 100644
--- a/src/gui/embedded/qscreen_qws.cpp
+++ b/src/gui/embedded/qscreen_qws.cpp
@@ -3150,6 +3150,7 @@ int QScreen::subScreenIndexAt(const QPoint &p) const
#if 0
#ifdef QT_LOADABLE_MODULES
+#include <dlfcn.h>
// ### needs update after driver init changes