From 65313ba793c0e7cec265a224feadb8e53fbf2681 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 25 Dec 2009 15:46:45 +0100 Subject: Add two new mkspecs for SunCC with stlport. Untested, but not used anywhere yet, so this cannot cause any problems. --- mkspecs/solaris-cc-64-stlport/qmake.conf | 8 ++++++++ mkspecs/solaris-cc-64-stlport/qplatformdefs.h | 1 + mkspecs/solaris-cc-stlport/qmake.conf | 8 ++++++++ mkspecs/solaris-cc-stlport/qplatformdefs.h | 1 + 4 files changed, 18 insertions(+) create mode 100644 mkspecs/solaris-cc-64-stlport/qmake.conf create mode 100644 mkspecs/solaris-cc-64-stlport/qplatformdefs.h create mode 100644 mkspecs/solaris-cc-stlport/qmake.conf create mode 100644 mkspecs/solaris-cc-stlport/qplatformdefs.h 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" -- cgit v0.12 From 90f22ce77a8f3b5a568b9c19df1798ef30afcbd2 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 25 Dec 2009 16:01:31 +0100 Subject: Fix build on ARMv6 when NEON is detected. The compiler requires -mfpu=neon to enable NEON instructions. --- src/gui/painting/painting.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 0b1e79a..a6cc9c7 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -383,7 +383,7 @@ neon { DEFINES += QT_HAVE_NEON HEADERS += painting/qdrawhelper_neon_p.h SOURCES += painting/qdrawhelper_neon.cpp - QMAKE.CXXFLAGS *= -mfpu=neon + QMAKE_CXXFLAGS *= -mfpu=neon } contains(QT_CONFIG, zlib) { -- cgit v0.12 From 7a0fb8407b0737d6f10181846dd49791e094fd88 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Fri, 25 Dec 2009 17:09:52 +0100 Subject: FTBFS on hurd-i386 because since clock_gettime is not available there qt4-x11 reverts to using gettimeofday, but it doesn't include where the latter is defined. Debian bug #533526 Task-number: QTBUG-6961 Reviewed-by: Thiago Macieira --- src/corelib/concurrent/qtconcurrentiteratekernel.cpp | 3 +++ 1 file changed, 3 insertions(+) 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 #include #elif defined(Q_OS_UNIX) +#if defined(Q_OS_HURD) +#include +#endif #include #include #elif defined(Q_OS_WIN) -- cgit v0.12