summaryrefslogtreecommitdiffstats
path: root/mkspecs/solaris-cc-stlport/qplatformdefs.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2009-12-25 17:21:24 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2009-12-25 17:21:24 (GMT)
commita87c7d4cb3d667694bf58ab53b3d69ce82869718 (patch)
tree4514d66bb9db898ce8a597feef6641aa2e701b69 /mkspecs/solaris-cc-stlport/qplatformdefs.h
parenta1c15ddb82e07dae2e1ed4ae971586379cbf6649 (diff)
parent7a0fb8407b0737d6f10181846dd49791e094fd88 (diff)
downloadQt-a87c7d4cb3d667694bf58ab53b3d69ce82869718.zip
Qt-a87c7d4cb3d667694bf58ab53b3d69ce82869718.tar.gz
Qt-a87c7d4cb3d667694bf58ab53b3d69ce82869718.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: 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 'mkspecs/solaris-cc-stlport/qplatformdefs.h')
-rw-r--r--mkspecs/solaris-cc-stlport/qplatformdefs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/solaris-cc-stlport/qplatformdefs.h b/mkspecs/solaris-cc-stlport/qplatformdefs.h
new file mode 100644
index 0000000..7bedf35
--- /dev/null
+++ b/mkspecs/solaris-cc-stlport/qplatformdefs.h
@@ -0,0 +1 @@
+#include "../solaris-cc/qplatformdefs.h"