diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-25 17:21:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-25 17:21:24 (GMT) |
| commit | a87c7d4cb3d667694bf58ab53b3d69ce82869718 (patch) | |
| tree | 4514d66bb9db898ce8a597feef6641aa2e701b69 | |
| parent | a1c15ddb82e07dae2e1ed4ae971586379cbf6649 (diff) | |
| parent | 7a0fb8407b0737d6f10181846dd49791e094fd88 (diff) | |
| download | Qt-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.
| -rw-r--r-- | mkspecs/solaris-cc-64-stlport/qmake.conf | 8 | ||||
| -rw-r--r-- | mkspecs/solaris-cc-64-stlport/qplatformdefs.h | 1 | ||||
| -rw-r--r-- | mkspecs/solaris-cc-stlport/qmake.conf | 8 | ||||
| -rw-r--r-- | mkspecs/solaris-cc-stlport/qplatformdefs.h | 1 | ||||
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentiteratekernel.cpp | 3 |
5 files changed, 21 insertions, 0 deletions
diff --git a/mkspecs/solaris-cc-64-stlport/qmake.conf b/mkspecs/solaris-cc-64-stlport/qmake.conf new file mode 100644 index 0000000..3437b8f --- /dev/null +++ b/mkspecs/solaris-cc-64-stlport/qmake.conf @@ -0,0 +1,8 @@ +# +# qmake configuration for solaris-cc-64-stlport +# + +include(../solaris-cc-64/qmake.conf) + +QMAKE_CXXFLAGS += -library=stlport4 +QMAKE_LFLAGS += -library=stlport4 diff --git a/mkspecs/solaris-cc-64-stlport/qplatformdefs.h b/mkspecs/solaris-cc-64-stlport/qplatformdefs.h new file mode 100644 index 0000000..17bc159 --- /dev/null +++ b/mkspecs/solaris-cc-64-stlport/qplatformdefs.h @@ -0,0 +1 @@ +#include "../solaris-cc-64/qplatformdefs.h" diff --git a/mkspecs/solaris-cc-stlport/qmake.conf b/mkspecs/solaris-cc-stlport/qmake.conf new file mode 100644 index 0000000..b0df45e --- /dev/null +++ b/mkspecs/solaris-cc-stlport/qmake.conf @@ -0,0 +1,8 @@ +# +# qmake configuration for solaris-cc-stlport +# + +include(../solaris-cc/qmake.conf) + +QMAKE_CXXFLAGS += -library=stlport4 +QMAKE_LFLAGS += -library=stlport4 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" diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp index 15b8ecd..e93394f 100644 --- a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp +++ b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp @@ -46,6 +46,9 @@ #include <mach/mach_time.h> #include <unistd.h> #elif defined(Q_OS_UNIX) +#if defined(Q_OS_HURD) +#include <sys/time.h> +#endif #include <time.h> #include <unistd.h> #elif defined(Q_OS_WIN) |